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

Quick thing before merge

Browse Source
This commit is contained in:
Mysticate 2015-12-06 11:45:10 -05:00
parent 3f37b893d3
commit 11b2748a5a
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
View File

@ -15,7 +15,6 @@ import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.EnderPearl;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Snowball;
import org.bukkit.entity.ThrownPotion;
@ -93,6 +92,8 @@ public class Paintball extends TeamGame
StrictAntiHack = true;
HungerSet = 20;
InventoryClick = false;
registerStatTrackers(
new KillingSpreeTracker(this),
@ -135,7 +136,7 @@ public class Paintball extends TeamGame
if (event.getCause() == TeleportCause.ENDER_PEARL)
event.setCancelled(true);
}
@SuppressWarnings("deprecation")
@EventHandler
public void Paint(final ProjectileHitEvent event)
@ -198,9 +199,9 @@ public class Paintball extends TeamGame
if (_doubles.containsKey(player))
{
PlayerCopy copy = _doubles.get(player);
PlayerCopy copy = _doubles.remove(player);
copy.GetEntity().remove();
_doubles.remove(player);
copy.GetHolo().stop();
}
}
@ -297,14 +298,8 @@ public class Paintball extends TeamGame
@EventHandler
public void ArmorRemoveCancel(InventoryClickEvent event)
{
HumanEntity player = event.getWhoClicked();
// Fixed armor being taken off while spectating after being painted.
if (!IsAlive(player))
{
if (!IsAlive(event.getWhoClicked()))
event.setCancelled(true);
}
}
public boolean Color(Player player, int amount)

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/kits/perks/PerkPaintballSniper.java
View File

@ -285,8 +285,8 @@ public class PerkPaintballSniper extends Perk
if (Manager.GetCondition().HasCondition(player, ConditionType.SLOW, GetName()))
Manager.GetCondition().EndCondition(player, ConditionType.SLOW, GetName());
if (Manager.GetCondition().HasCondition(player, ConditionType.JUMP, GetName()))
Manager.GetCondition().EndCondition(player, ConditionType.JUMP, GetName());
// if (Manager.GetCondition().HasCondition(player, ConditionType.JUMP, GetName()))
// Manager.GetCondition().EndCondition(player, ConditionType.JUMP, GetName());
}
private void addEffects(Player player)