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

Merge branch 'master' of github.com:walterhiggins/ScriptCraft

Browse source
This commit is contained in:
walterhiggins 2014-03-08 12:13:57 +00:00
parent cd52379b5c 64913338a7
commit d16487bcc3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/js/plugins/minigames/SnowballFight.js
View file

@ -139,7 +139,7 @@ var _getTeam = function( player, pteams ) {
var createGame = function( duration, teams ) { var createGame = function( duration, teams ) {
var players, var players,
i, i,
_snowBalls = new ItemStack( Material.SNOW_BALL, 64 ); _snowBalls = new bkItemStack( bkMaterial.SNOW_BALL, 64 );
var _gameState = { var _gameState = {
teams: teams, teams: teams,
@ -179,7 +179,7 @@ var createGame = function( duration, teams ) {
*/ */
var _onSnowballHit = function( l, event ) { var _onSnowballHit = function( l, event ) {
var snowball = event.damager; var snowball = event.damager;
if ( !snowball || !( snowball instanceof Snowball ) ) { if ( !snowball || !( snowball instanceof bkSnowball ) ) {
return; return;
} }
var throwersTeam = _getTeam( snowball.shooter, _gameState.teams ); var throwersTeam = _getTeam( snowball.shooter, _gameState.teams );

2
src/main/js/plugins/spawn.js
View file

@ -37,5 +37,5 @@ command( 'spawn', function( parameters, sender ) {
} }
var world = location.world; var world = location.world;
var type = ('' + parameters[0]).toUpperCase(); var type = ('' + parameters[0]).toUpperCase();
world.spawnEntity( location, EntityType[type] ); world.spawnEntity( location, bkEntityType[type] );
}, entities ); }, entities );