From baac1cbe3fec1eac8fa056ebcd740c3ea5e134b2 Mon Sep 17 00:00:00 2001 From: Robert Storlind Date: Fri, 10 Apr 2015 22:25:44 +0200 Subject: [PATCH] Bukkit and CanaryMod links corrected. jslint. The bukkit link was broken, btw. --- src/main/js/plugins/spawn.js | 53 +++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/src/main/js/plugins/spawn.js b/src/main/js/plugins/spawn.js index 17ed2fe..dd6272f 100644 --- a/src/main/js/plugins/spawn.js +++ b/src/main/js/plugins/spawn.js @@ -1,3 +1,6 @@ +'use strict'; +/*global Packages, __plugin, command, echo, isOp, org */ +/*jslint nomen: true, indent: 2 */ /************************************************************************* ## Spawn Plugin @@ -12,41 +15,47 @@ Allows in-game operators to easily spawn creatures at current location. This command supports TAB completion so to see a list of possible entitities, type `/jsp spawn ' at the in-game command prompt, then press TAB. Visit - + (CanaryMod) +or (Bukkit) + for a list of possible entities (creatures) which can be spawned. ***/ -var entities = []; -var entityType = null; -if (__plugin.canary){ - entityType = Packages.net.canarymod.api.entity.EntityType; -}else { +var entities = [], + entityType = null, + entitytypes, + t; +if (__plugin.bukkit) { entityType = org.bukkit.entity.EntityType; } -var entitytypes = entityType.values(); -for ( var t in entitytypes ) { - if ( entitytypes[t] && entitytypes[t].ordinal ) { +if (__plugin.canary) { + entityType = Packages.net.canarymod.api.entity.EntityType; +} +entitytypes = entityType.values(); +for (t in entitytypes) { + if (entitytypes[t] && entitytypes[t].ordinal) { entities.push(entitytypes[t].name()); } } -command( 'spawn', function( parameters, sender ) { - if ( !isOp(sender) ) { - echo( sender, 'Only operators can perform this command' ); +command('spawn', function (parameters, sender) { + if (!isOp(sender)) { + echo(sender, 'Only operators can perform this command'); return; } var location = sender.location; - if ( !location ) { - echo( sender, 'You have no location. This command only works in-game.' ); + if (!location) { + echo(sender, 'You have no location. This command only works in-game.'); return; } - var world = location.world || sender.world; - var type = ('' + parameters[0]).toUpperCase(); - if (__plugin.bukkit){ - world.spawnEntity( location, entityType[type] ); - } else { - var Canary = Packages.net.canarymod.Canary; - var entity = Canary.factory().entityFactory.newEntity(entityType[type], location); + var world = location.world || sender.world, + type = ('' + parameters[0]).toUpperCase(); + if (__plugin.bukkit) { + world.spawnEntity(location, entityType[type]); + } + if (__plugin.canary) { + var Canary = Packages.net.canarymod.Canary, + entity = Canary.factory().entityFactory.newEntity(entityType[type], location); entity.spawn(); } -}, entities ); +}, entities);