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

replaced useless looping with just checking the rotation of the bed.

Browse Source
This commit is contained in:
NewGarbo 2015-11-18 09:58:06 +00:00
parent 1ea87b8354
commit cd0ce57691
1 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
View File

@ -27,7 +27,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
import mineplex.core.MiniPlugin; import mineplex.core.MiniPlugin;
import mineplex.core.blockrestore.BlockRestoreData; import mineplex.core.blockrestore.BlockRestoreData;
@ -45,6 +44,7 @@ import mineplex.core.itemstack.ItemStackFactory;
import mineplex.game.clans.clans.ClansUtility.ClanRelation; import mineplex.game.clans.clans.ClansUtility.ClanRelation;
import mineplex.game.clans.core.repository.ClanTerritory; import mineplex.game.clans.core.repository.ClanTerritory;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import net.minecraft.server.v1_8_R3.EnumDirection;
public class ClansGame extends MiniPlugin public class ClansGame extends MiniPlugin
{ {
@ -687,16 +687,47 @@ public class ClansGame extends MiniPlugin
{ {
clanHome.getBlock().setType(Material.AIR); clanHome.getBlock().setType(Material.AIR);
for (int x2 = -1; x2 < 1; x2++) byte data = clanHome.getBlock().getData();
EnumDirection dir = null;
int xModif = 0;
int zModif = 0;
if ((data & (1 << 0x2)) != 0)
{ {
for (int z2 = -1; z2 < 1; z2++) zModif = -1;
{ dir = EnumDirection.NORTH;
Block block = clanHome.clone().add(x2, 0, z2).getBlock();
if (block.getType().equals(Material.BED_BLOCK))
{
block.setType(Material.AIR);
} }
else if ((data & (1 << 0x0)) != 0)
{
zModif = 1;
dir = EnumDirection.SOUTH;
} }
else if ((data & (1 << 0x1)) != 0)
{
xModif = -1;
dir = EnumDirection.WEST;
}
else if ((data & (1 << 0x3)) != 0)
{
xModif = 1;
dir = EnumDirection.EAST;
}
if (dir == null)
{
return;
}
Block footBlock = clanHome.clone().add(xModif, 0, zModif).getBlock();
if (footBlock.getType().equals(Material.BED_BLOCK))
{
footBlock.setType(Material.AIR);
}
else
{
// Shoudln't happen, but just in case:
System.out.println("Second block of " + clan.getName() + "'s Clan Home should be a bed, but isn't. [STRANGE!!!]");
} }
clan.setHome(null); clan.setHome(null);