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

Fixed merge conflicts

Browse Source
This commit is contained in:
AlexTheCoder 2017-09-23 03:46:00 -04:00
parent fce33d3313
commit 9ad4cd0068
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/wither/creature/wither/CharlesWitherton.java
View File

@ -15,6 +15,8 @@ import net.minecraft.server.v1_8_R3.PathfinderGoalRandomStroll;
import org.bukkit.Location;
import org.bukkit.craftbukkit.libs.com.google.common.base.Predicate;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftWither;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@ -27,9 +29,11 @@ import org.bukkit.event.entity.EntityChangeBlockEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.worldevent.api.BossPassive;
import mineplex.game.clans.clans.worldevent.raid.RaidChallenge;
import mineplex.game.clans.clans.worldevent.raid.RaidCreature;
@ -130,6 +134,21 @@ public class CharlesWitherton extends RaidCreature<Wither>
return;
}
for (Block b : UtilBlock.getBlocksInRadius(getEntity().getLocation(), 4))
{
if (b.getType() == Material.ICE)
{
if (ClansManager.getInstance().getBlockRestore().contains(b))
{
ClansManager.getInstance().getBlockRestore().restore(b);
}
else
{
b.setType(Material.AIR);
}
}
}
_passive.tick();
_abilities.forEach(BossPassive::tick);

20
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/wither/creature/wither/MiniCharles.java
View File

@ -12,6 +12,8 @@ import net.minecraft.server.v1_8_R3.PathfinderGoalRandomStroll;
import org.bukkit.Location;
import org.bukkit.craftbukkit.libs.com.google.common.base.Predicate;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftWither;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@ -23,10 +25,11 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.entity.EntityChangeBlockEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.worldevent.raid.RaidChallenge;
import mineplex.game.clans.clans.worldevent.raid.RaidCreature;
import mineplex.game.clans.clans.worldevent.raid.wither.WitherRaid;
@ -104,6 +107,21 @@ public class MiniCharles extends RaidCreature<Wither>
return;
}
for (Block b : UtilBlock.getBlocksInRadius(getEntity().getLocation(), 4))
{
if (b.getType() == Material.ICE)
{
if (ClansManager.getInstance().getBlockRestore().contains(b))
{
ClansManager.getInstance().getBlockRestore().restore(b);
}
else
{
b.setType(Material.AIR);
}
}
}
_passive.tick();
_liveTicks++;