mirror/Mineplex
mirror/Mineplex
1
Fork 0
Code Releases Activity

Summoner Kit Fix

Browse Source 
Fixed an issue where  the Undead Summoner was a regular skeleton rather than a wither skeleton
This commit is contained in:
Daniel Waggner 2021-05-29 12:16:37 -07:00
parent fc179e824b
commit fa5895da14
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitCastleSiege.java
View File

@ -2,6 +2,7 @@ package nautilus.game.arcade.game.games.castlesiegenew.kits;
import mineplex.core.disguise.DisguiseManager; import mineplex.core.disguise.DisguiseManager;
import mineplex.core.disguise.disguises.DisguiseInsentient; import mineplex.core.disguise.disguises.DisguiseInsentient;
import mineplex.core.disguise.disguises.DisguiseSkeleton;
import mineplex.core.game.kit.GameKit; import mineplex.core.game.kit.GameKit;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.GameTeam;
@ -10,6 +11,7 @@ import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Skeleton;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -21,7 +23,7 @@ public abstract class KitCastleSiege extends Kit
private static final ItemStack AXE = new ItemStack(Material.STONE_AXE); private static final ItemStack AXE = new ItemStack(Material.STONE_AXE);
// private static final ItemStack AXE_5 = new ItemStack(Material.IRON_AXE); // private static final ItemStack AXE_5 = new ItemStack(Material.IRON_AXE);
public boolean _witherSkeleton;
KitCastleSiege(ArcadeManager manager, GameKit gameKit, Perk... perks) KitCastleSiege(ArcadeManager manager, GameKit gameKit, Perk... perks)
{ {
@ -50,11 +52,12 @@ public abstract class KitCastleSiege extends Kit
disguise.setCustomNameVisible(true); disguise.setCustomNameVisible(true);
// if (_witherSkeleton)
// { if (_witherSkeleton)
// DisguiseSkeleton disguiseSkeleton = (DisguiseSkeleton) disguise; {
// disguiseSkeleton.SetSkeletonType(Skeleton.SkeletonType.WITHER); DisguiseSkeleton disguiseSkeleton = (DisguiseSkeleton) disguise;
// } disguiseSkeleton.SetSkeletonType(Skeleton.SkeletonType.WITHER);
}
disguiseManager.disguise(disguise); disguiseManager.disguise(disguise);
} }

14
Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java
View File

@ -1,21 +1,19 @@
package nautilus.game.arcade.game.games.castlesiegenew.kits; package nautilus.game.arcade.game.games.castlesiegenew.kits;
import java.util.concurrent.TimeUnit;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.disguise.disguises.DisguiseSkeleton; import mineplex.core.disguise.disguises.DisguiseSkeleton;
import mineplex.core.game.kit.GameKit; import mineplex.core.game.kit.GameKit;
import mineplex.core.itemstack.ItemBuilder; import mineplex.core.itemstack.ItemBuilder;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.castlesiegenew.perks.MobPotion; import nautilus.game.arcade.game.games.castlesiegenew.perks.MobPotion;
import nautilus.game.arcade.game.games.castlesiegenew.perks.PerkMobPotions; import nautilus.game.arcade.game.games.castlesiegenew.perks.PerkMobPotions;
import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import java.util.concurrent.TimeUnit;
public class KitUndeadSummoner extends KitCastleSiege public class KitUndeadSummoner extends KitCastleSiege
{ {
@ -47,8 +45,10 @@ public class KitUndeadSummoner extends KitCastleSiege
public void GiveItems(Player player) public void GiveItems(Player player)
{ {
giveItems(player); giveItems(player);
_witherSkeleton = true;
disguise(player, DisguiseSkeleton.class); disguise(player, DisguiseSkeleton.class);
for (Perk perk : GetPerks()) for (Perk perk : GetPerks())
{ {
for (MobPotion potion : ((PerkMobPotions) perk).getMobPotions()) for (MobPotion potion : ((PerkMobPotions) perk).getMobPotions())