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

Fix UtilVariant and disable Thanksgiving Chickens in Christmas Chaos

Browse Source
This commit is contained in:
AlexTheCoder 2016-11-26 18:23:25 -05:00 committed by cnr
parent e8cc23279f
commit df741fd394
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/utils/UtilVariant.java
View File

@ -34,6 +34,7 @@ public class UtilVariant
World world = ((CraftWorld) location.getWorld()).getHandle(); World world = ((CraftWorld) location.getWorld()).getHandle();
EntityZombie zombie = new EntityZombie(world); EntityZombie zombie = new EntityZombie(world);
zombie.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
zombie.setVillager(true); zombie.setVillager(true);
world.addEntity(zombie, CreatureSpawnEvent.SpawnReason.CUSTOM); world.addEntity(zombie, CreatureSpawnEvent.SpawnReason.CUSTOM);
@ -45,6 +46,7 @@ public class UtilVariant
World world = ((CraftWorld) location.getWorld()).getHandle(); World world = ((CraftWorld) location.getWorld()).getHandle();
EntitySkeleton skeleton = new EntitySkeleton(world); EntitySkeleton skeleton = new EntitySkeleton(world);
skeleton.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
skeleton.setSkeletonType(1); skeleton.setSkeletonType(1);
world.addEntity(skeleton, CreatureSpawnEvent.SpawnReason.CUSTOM); world.addEntity(skeleton, CreatureSpawnEvent.SpawnReason.CUSTOM);
@ -56,6 +58,7 @@ public class UtilVariant
World world = ((CraftWorld) location.getWorld()).getHandle(); World world = ((CraftWorld) location.getWorld()).getHandle();
EntityGuardian guardian = new EntityGuardian(world); EntityGuardian guardian = new EntityGuardian(world);
guardian.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
guardian.setElder(true); guardian.setElder(true);
world.addEntity(guardian, CreatureSpawnEvent.SpawnReason.CUSTOM); world.addEntity(guardian, CreatureSpawnEvent.SpawnReason.CUSTOM);

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part4.java
View File

@ -181,15 +181,10 @@ public class Part4 extends Part
//Create //Create
Location loc = UtilAlg.Random(_mobSpawns); Location loc = UtilAlg.Random(_mobSpawns);
Bukkit.broadcastMessage(Host.CreatureAllowOverride + "");
Host.CreatureAllowOverride = true; Host.CreatureAllowOverride = true;
Zombie ent = UtilVariant.spawnZombieVillager(loc); Zombie ent = UtilVariant.spawnZombieVillager(loc);
Bukkit.broadcastMessage("SPAWNING");
Host.CreatureAllowOverride = false; Host.CreatureAllowOverride = false;
Bukkit.broadcastMessage(Host.CreatureAllowOverride + "");
ent.getEquipment().setItemInHand(new ItemStack(Material.WOOD_PICKAXE)); ent.getEquipment().setItemInHand(new ItemStack(Material.WOOD_PICKAXE));
ent.getEquipment().setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE)); ent.getEquipment().setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE));
ent.getEquipment().setLeggings(new ItemStack(Material.LEATHER_LEGGINGS)); ent.getEquipment().setLeggings(new ItemStack(Material.LEATHER_LEGGINGS));

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/HolidayManager.java
View File

@ -54,6 +54,7 @@ import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.games.christmas.Christmas;
import nautilus.game.arcade.game.games.uhc.UHC; import nautilus.game.arcade.game.games.uhc.UHC;
import nautilus.game.arcade.managers.events.SpecialEntityDeathEvent; import nautilus.game.arcade.managers.events.SpecialEntityDeathEvent;
import net.minecraft.server.v1_8_R3.BlockPosition; import net.minecraft.server.v1_8_R3.BlockPosition;
@ -257,6 +258,9 @@ public class HolidayManager implements Listener
if (game instanceof UHC) if (game instanceof UHC)
return; return;
if (game instanceof Christmas)
return;
if (!UtilTime.elapsed(_lastSpawn, 90000)) if (!UtilTime.elapsed(_lastSpawn, 90000))
return; return;