arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed Arrow() and Sign() from global namespace

Browse source
This commit is contained in:
walterhiggins 2013-01-15 00:18:05 +00:00
parent af5436cf82
commit 77de4a1134
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js-plugins/arrows.js
View file

@ -61,7 +61,9 @@ var arrows = arrows || {};
var projectile = event.entity; var projectile = event.entity;
var world = projectile.world; var world = projectile.world;
var shooter = projectile.shooter; var shooter = projectile.shooter;
if (projectile instanceof Arrow && shooter instanceof Player){ if (projectile instanceof org.bukkit.entity.Arrow &&
shooter instanceof org.bukkit.entity.Player)
{
var arrowType = _players[shooter.name]; var arrowType = _players[shooter.name];
switch (arrowType){ switch (arrowType){
case 1: case 1:

10
js-plugins/core/_primitives.js
View file

@ -18,10 +18,6 @@
return; return;
} }
importPackage(org.bukkit.command);
importPackage(org.bukkit.block);
importPackage(org.bukkit.entity);
var _getPlayerPos = function(){ var _getPlayerPos = function(){
if (typeof __self == "undefined") if (typeof __self == "undefined")
return; return;
@ -58,7 +54,7 @@
putBlock(x,y,z,blockId,meta); putBlock(x,y,z,blockId,meta);
var block = _getBlockObject(x,y,z); var block = _getBlockObject(x,y,z);
state = block.state; state = block.state;
if (state instanceof Sign){ if (state instanceof org.bukkit.block.Sign){
for (var i = 0;i < texts.length; i++) for (var i = 0;i < texts.length; i++)
state.setLine(i%4,texts[i]); state.setLine(i%4,texts[i]);
state.update(true); state.update(true);
@ -80,9 +76,9 @@
var _getWorld = function(){ var _getWorld = function(){
if (typeof __self == "undefined") if (typeof __self == "undefined")
return; return;
if (__self instanceof BlockCommandSender) if (__self instanceof org.bukkit.command.BlockCommandSender)
return __self.block.location.world; return __self.block.location.world;
if (__self instanceof Player) if (__self instanceof org.bukkit.entity.Player)
return __self.location.world; return __self.location.world;
}; };