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

Skywars hotfix

This commit is contained in:
Sam 2018-01-18 18:56:01 +00:00 committed by Alexander Meech
parent 85c721bb93
commit 962be63970
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
View File

@ -315,10 +315,6 @@ public abstract class Skywars extends Game
.addItem(new ItemStack(Material.IRON_CHESTPLATE)) .addItem(new ItemStack(Material.IRON_CHESTPLATE))
.addItem(new ItemStack(Material.IRON_LEGGINGS)) .addItem(new ItemStack(Material.IRON_LEGGINGS))
.addItem(new ItemStack(Material.IRON_BOOTS)) .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_ENVIRONMENTAL, 2)
.addEnchantment(Enchantment.PROTECTION_PROJECTILE, 2) .addEnchantment(Enchantment.PROTECTION_PROJECTILE, 2)
.setAmountsPerChest(1, 2) .setAmountsPerChest(1, 2)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkFireBurst.java
View File

@ -47,7 +47,7 @@ public class PerkFireBurst extends SkywarsPerk
} }
other.setFireTicks(FIRE_TICKS); 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) for (double radius = 0; radius < _range; radius += 0.5)

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/perks/PerkMagnetism.java
View File

@ -22,7 +22,6 @@ import mineplex.core.common.util.particles.effects.LineParticle;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.games.skywars.TeamSkywars; 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) private int getAmountOfMetalArmor(Player player)
{ {
int magnitude = 0; int magnitude = 0;

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/chest/ChestLootModule.java
View File

@ -284,6 +284,11 @@ public class ChestLootModule extends Module
private byte getData(BlockFace face) private byte getData(BlockFace face)
{ {
if (face == null)
{
return 0;
}
switch (face) switch (face)
{ {
case NORTH: case NORTH: