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

Bug Fix

Browse Source 
Fixed an issue where users would be displayed as wolves if they did not have any kits on their accountkits table records.
This commit is contained in:
Daniel Waggner 2021-05-29 15:32:23 -07:00
parent 10c7573684
commit da2f33832a
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanKnight.java
View File

@ -1,5 +1,6 @@
package nautilus.game.arcade.game.games.castlesiegenew.kits; package nautilus.game.arcade.game.games.castlesiegenew.kits;
import mineplex.core.disguise.disguises.DisguiseBase;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -52,5 +53,8 @@ public class KitHumanKnight extends KitCastleSiege
{ {
player.getInventory().addItem(PLAYER_ITEMS); player.getInventory().addItem(PLAYER_ITEMS);
player.getInventory().setArmorContents(ARMOR); player.getInventory().setArmorContents(ARMOR);
DisguiseBase disguise = Manager.GetDisguise().getActiveDisguise(player);
Manager.GetDisguise().undisguise(disguise);
} }
} }

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

@ -1,21 +1,19 @@
package nautilus.game.arcade.game.games.castlesiegenew.kits; package nautilus.game.arcade.game.games.castlesiegenew.kits;
import org.bukkit.Material; import mineplex.core.disguise.disguises.DisguiseBase;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import mineplex.core.game.kit.GameKit; import mineplex.core.game.kit.GameKit;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.smash.perks.skeleton.PerkBarrage; import nautilus.game.arcade.game.games.smash.perks.skeleton.PerkBarrage;
import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.perks.PerkFletcher; import nautilus.game.arcade.kit.perks.PerkFletcher;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public class KitHumanMarksman extends KitCastleSiege public class KitHumanMarksman extends KitCastleSiege
{ {
private static final Perk[] PERKS = private static final Perk[] PERKS =
{ {
new PerkBarrage(5, 250, true, false), new PerkBarrage(5, 250, true, false),
@ -50,5 +48,9 @@ public class KitHumanMarksman extends KitCastleSiege
player.getInventory().addItem(PLAYER_ITEMS); player.getInventory().addItem(PLAYER_ITEMS);
player.getInventory().setArmorContents(ARMOR); player.getInventory().setArmorContents(ARMOR);
player.getInventory().addItem(PLAYER_ITEMS[3], PLAYER_ITEMS[3]); player.getInventory().addItem(PLAYER_ITEMS[3], PLAYER_ITEMS[3]);
DisguiseBase disguise = Manager.GetDisguise().getActiveDisguise(player);
Manager.GetDisguise().undisguise(disguise);
} }
} }

20
Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitHumanPaladin.java
View File

@ -1,20 +1,19 @@
package nautilus.game.arcade.game.games.castlesiegenew.kits; package nautilus.game.arcade.game.games.castlesiegenew.kits;
import java.util.concurrent.TimeUnit; import mineplex.core.disguise.disguises.DisguiseBase;
import mineplex.core.game.kit.GameKit;
import mineplex.core.itemstack.ItemStackFactory;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.castlesiegenew.perks.PerkPaladinBoost;
import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.perks.PerkIronSkin;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import mineplex.core.game.kit.GameKit; import java.util.concurrent.TimeUnit;
import mineplex.core.itemstack.ItemStackFactory;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.castlesiegenew.perks.PerkPaladinBoost;
import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.perks.PerkIronSkin;
public class KitHumanPaladin extends KitCastleSiege public class KitHumanPaladin extends KitCastleSiege
{ {
@ -57,5 +56,8 @@ public class KitHumanPaladin extends KitCastleSiege
{ {
player.getInventory().addItem(PLAYER_ITEMS); player.getInventory().addItem(PLAYER_ITEMS);
player.getInventory().setArmorContents(ARMOR); player.getInventory().setArmorContents(ARMOR);
DisguiseBase disguise = Manager.GetDisguise().getActiveDisguise(player);
Manager.GetDisguise().undisguise(disguise);
} }
} }