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

Try and fix undead city

This commit is contained in:
Sam 2018-07-24 20:46:03 +01:00 committed by Alexander Meech
parent 293880cee9
commit f9a47c6cc2
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/GoldLoot.java
View File

@ -23,7 +23,7 @@ public class GoldLoot implements ILoot
public void dropLoot(Location location)
{
int count = _min + UtilMath.r(_max - _min);
_goldManager.dropGold(location.clone().add(0, 3, 0), count);
_goldManager.dropGold(location.clone().add(0, 1, 0), count);
}
@Override

11
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/ItemLoot.java
View File

@ -8,10 +8,9 @@ import mineplex.core.common.util.UtilMath;
public class ItemLoot implements ILoot
{
private Material _material;
private byte _data;
private int _min;
private int _max;
private final Material _material;
private final byte _data;
private final int _min, _max;
public ItemLoot(Material material)
{
@ -34,9 +33,7 @@ public class ItemLoot implements ILoot
@Override
public void dropLoot(Location location)
{
int count = UtilMath.rRange(_min, _max);
ItemStack item = new ItemStack(_material, count, (short) 0, _data);
location.getWorld().dropItemNaturally(location.clone().add(0, 3, 0), item);
location.getWorld().dropItemNaturally(location.clone().add(0, 1, 0), getItemStack());
}
@Override

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java
View File

@ -11,8 +11,8 @@ import mineplex.game.clans.items.GearManager;
public class LootManager
{
private GearManager _gearManager;
private GoldManager _goldManager;
private final GearManager _gearManager;
private final GoldManager _goldManager;
private WeightSet<ILoot> _commonSet;
private WeightSet<ILoot> _rareSet;

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/CityChest.java
View File

@ -39,7 +39,7 @@ public class CityChest
{
_block.setType(Material.AIR);
_block.getWorld().playEffect(_block.getLocation(), Effect.STEP_SOUND, Material.ENDER_CHEST.getId());
ClansManager.getInstance().getLootManager().dropUndeadCity(_block.getLocation());
ClansManager.getInstance().getLootManager().dropUndeadCity(_block.getLocation().add(0.5, 0, 0.5));
_opened = true;
}

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/undead/UndeadCity.java
View File

@ -33,6 +33,7 @@ import mineplex.game.clans.clans.worldevent.undead.creature.UndeadWarrior;
public class UndeadCity extends WorldEvent
{
private final int _maxChests;
private final int _maxMobs;
private final Map<BlockPosition, CityChest> _chests = new HashMap<>();
@ -58,7 +59,9 @@ public class UndeadCity extends WorldEvent
{
int addedChests = 0;
int addedMobs = 0;
for (Block block : UtilBlock.getInRadius(getCenterLocation(), 55).keySet())
double size = getEventArena().getRadius();
for (Block block : UtilBlock.getInBoundingBox(getCenterLocation().clone().add(size, size, size), getCenterLocation().clone().subtract(size, size, size)))
{
if (block.getType() == Material.ENDER_CHEST)
{