From 962be639706e12d2195f83cc155fc555fe4d2a56 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 18 Jan 2018 18:56:01 +0000 Subject: [PATCH] Skywars hotfix --- .../game/arcade/game/games/skywars/Skywars.java | 4 ---- .../games/skywars/kits/perks/PerkFireBurst.java | 2 +- .../games/skywars/kits/perks/PerkMagnetism.java | 14 -------------- .../arcade/game/modules/chest/ChestLootModule.java | 5 +++++ 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java index afd451b81..d9924ea4e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java @@ -315,10 +315,6 @@ public abstract class Skywars extends Game .addItem(new ItemStack(Material.IRON_CHESTPLATE)) .addItem(new ItemStack(Material.IRON_LEGGINGS)) .addItem(new ItemStack(Material.IRON_BOOTS)) - .addItem(new ItemStack(Material.DIAMOND_HELMET), 20) - .addItem(new ItemStack(Material.DIAMOND_CHESTPLATE), 20) - .addItem(new ItemStack(Material.DIAMOND_LEGGINGS), 20) - .addItem(new ItemStack(Material.DIAMOND_BOOTS), 20) .addEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, 2) .addEnchantment(Enchantment.PROTECTION_PROJECTILE, 2) .setAmountsPerChest(1, 2) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkFireBurst.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkFireBurst.java index e8d4ac69b..3273a2f25 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkFireBurst.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkFireBurst.java @@ -47,7 +47,7 @@ public class PerkFireBurst extends SkywarsPerk } other.setFireTicks(FIRE_TICKS); - Manager.GetDamage().NewDamageEvent(other, player, null, DamageCause.CUSTOM, _damage, true, true, true, player.getName(), GetName()); + Manager.GetDamage().NewDamageEvent(other, player, null, DamageCause.CUSTOM, _damage, false, true, true, player.getName(), GetName()); } for (double radius = 0; radius < _range; radius += 0.5) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkMagnetism.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkMagnetism.java index a1b906b0d..810a6c138 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkMagnetism.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkMagnetism.java @@ -22,7 +22,6 @@ import mineplex.core.common.util.particles.effects.LineParticle; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.minecraft.game.core.damage.CustomDamageEvent; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.games.skywars.TeamSkywars; @@ -128,19 +127,6 @@ public class PerkMagnetism extends SkywarsPerk } } - @EventHandler - public void damage(CustomDamageEvent event) - { - Player player = event.GetDamageePlayer(); - - if (player == null || !hasPerk(player)) - { - return; - } - - event.AddKnockback(GetName(), -0.05 * getAmountOfMetalArmor(player)); - } - private int getAmountOfMetalArmor(Player player) { int magnitude = 0; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/chest/ChestLootModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/chest/ChestLootModule.java index 64b79318e..b4435cbc8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/chest/ChestLootModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/chest/ChestLootModule.java @@ -284,6 +284,11 @@ public class ChestLootModule extends Module private byte getData(BlockFace face) { + if (face == null) + { + return 0; + } + switch (face) { case NORTH: