JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in MineStrike

Browse Source
This commit is contained in:
Chiss 2014-09-13 12:29:35 +10:00
parent f0fa3469df
commit e36f843feb
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java
View File

@ -89,6 +89,8 @@ public class TextManager extends MiniPlugin
UtilText.MakeText("SURVIVAL GAMES", locSurvival.clone().add(-15, 21, 0), faceSurvival, 159, (byte)1, TextAlign.CENTER);
UtilText.MakeText("SURVIVAL GAMES", locSurvival.clone().add(-16, 21, 0), faceSurvival, 159, (byte)15, TextAlign.CENTER);
//UtilText.MakeText("ULTRA HARDCORE", locSurvival.clone().add(-15, 28, 0), faceSurvival, 159, (byte)14, TextAlign.CENTER);
//UtilText.MakeText("ULTRA HARDCORE", locSurvival.clone().add(-16, 28, 0), faceSurvival, 159, (byte)15, TextAlign.CENTER);
//Other
UtilText.MakeText("CLASSICS", locClassics, faceOther, 159, (byte)5, TextAlign.CENTER);

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
View File

@ -740,16 +740,16 @@ public class MineStrike extends TeamGame
Gun gun = _gunsDropped.get(event.getItem());
if (gun != null)
{
gun.pickup(this, event.getPlayer());
event.getItem().remove();
if (gun.pickup(this, event.getPlayer()))
event.getItem().remove();
}
//Grenades
Grenade grenade = _grenadesDropped.get(event.getItem());
if (grenade != null)
{
grenade.pickup(this, event.getPlayer());
event.getItem().remove();
if (grenade.pickup(this, event.getPlayer()))
event.getItem().remove();
}
//Defusal

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Grenade.java
View File

@ -185,6 +185,8 @@ public abstract class Grenade extends StrikeItem
{
game.registerGrenade(this, player);
game.deregisterDroppedGrenade(this);
return true;
}
return false;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
View File

@ -174,6 +174,8 @@ public class SurvivalGames extends SoloGame
this.ItemPickup = true;
this.InventoryClick = true;
this.InventoryOpenBlock = true;
this.InventoryOpenChest = true;
this.CompassEnabled = false; //XXX