TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-03 11:06:08 +00:00
Code Issues Projects Releases Wiki Activity

Deprecating the old sign code and adding the new code.

Browse source 
Please test everything without EssentialsProtect. The signs should protect themselves.
This commit is contained in:
snowleo 2011-06-26 16:17:45 +02:00
parent fa5d6fbfae
commit a6d60dbc94
6 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Essentials/src/com/earth2me/essentials/Essentials.java
View file

@ -27,6 +27,9 @@ import org.bukkit.command.CommandSender;
import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.commands.NotEnoughArgumentsException; import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import com.earth2me.essentials.register.payment.Methods; import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.signs.SignBlockListener;
import com.earth2me.essentials.signs.SignEntityListener;
import com.earth2me.essentials.signs.SignPlayerListener;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -185,9 +188,22 @@ public class Essentials extends JavaPlugin implements IEssentials
pm.registerEvent(Type.PLAYER_ANIMATION, playerListener, Priority.High, this); pm.registerEvent(Type.PLAYER_ANIMATION, playerListener, Priority.High, this);
final EssentialsBlockListener blockListener = new EssentialsBlockListener(this); final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Low, this); //pm.registerEvent(Type.SIGN_CHANGE, blockListener, Priority.Low, this);
pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Lowest, this); //pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Lowest, this);
pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this); pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this);
final SignBlockListener signBlockListener = new SignBlockListener(this);
pm.registerEvent(Type.SIGN_CHANGE, signBlockListener, Priority.Low, this);
pm.registerEvent(Type.BLOCK_PLACE, signBlockListener, Priority.Low, this);
pm.registerEvent(Type.BLOCK_BREAK, signBlockListener, Priority.Low, this);
pm.registerEvent(Type.BLOCK_IGNITE, signBlockListener, Priority.Low, this);
pm.registerEvent(Type.BLOCK_BURN, signBlockListener, Priority.Low, this);
final SignPlayerListener signPlayerListener = new SignPlayerListener(this);
pm.registerEvent(Type.PLAYER_INTERACT, signPlayerListener, Priority.Low, this);
final SignEntityListener signEntityListener = new SignEntityListener(this);
pm.registerEvent(Type.ENTITY_EXPLODE, signEntityListener, Priority.Low, this);
final EssentialsEntityListener entityListener = new EssentialsEntityListener(this); final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this); pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this);
@ -201,7 +217,7 @@ public class Essentials extends JavaPlugin implements IEssentials
pm.registerEvent(Type.BLOCK_DAMAGE, jail, Priority.High, this); pm.registerEvent(Type.BLOCK_DAMAGE, jail, Priority.High, this);
pm.registerEvent(Type.BLOCK_PLACE, jail, Priority.High, this); pm.registerEvent(Type.BLOCK_PLACE, jail, Priority.High, this);
pm.registerEvent(Type.PLAYER_INTERACT, jailPlayerListener, Priority.High, this); pm.registerEvent(Type.PLAYER_INTERACT, jailPlayerListener, Priority.High, this);
attachEcoListeners(); //attachEcoListeners();
if (settings.isNetherEnabled() && getServer().getWorlds().size() < 2) if (settings.isNetherEnabled() && getServer().getWorlds().size() < 2)
{ {
@ -598,12 +614,12 @@ public class Essentials extends JavaPlugin implements IEssentials
private void attachEcoListeners() private void attachEcoListeners()
{ {
PluginManager pm = getServer().getPluginManager(); //PluginManager pm = getServer().getPluginManager();
EssentialsEcoBlockListener ecoBlockListener = new EssentialsEcoBlockListener(this); //EssentialsEcoBlockListener ecoBlockListener = new EssentialsEcoBlockListener(this);
EssentialsEcoPlayerListener ecoPlayerListener = new EssentialsEcoPlayerListener(this); //EssentialsEcoPlayerListener ecoPlayerListener = new EssentialsEcoPlayerListener(this);
pm.registerEvent(Type.PLAYER_INTERACT, ecoPlayerListener, Priority.High, this); //pm.registerEvent(Type.PLAYER_INTERACT, ecoPlayerListener, Priority.High, this);
pm.registerEvent(Type.BLOCK_BREAK, ecoBlockListener, Priority.High, this); //pm.registerEvent(Type.BLOCK_BREAK, ecoBlockListener, Priority.High, this);
pm.registerEvent(Type.SIGN_CHANGE, ecoBlockListener, Priority.Monitor, this); //pm.registerEvent(Type.SIGN_CHANGE, ecoBlockListener, Priority.Monitor, this);
} }
public CraftScheduler getScheduler() public CraftScheduler getScheduler()

17
Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
View file

@ -33,6 +33,7 @@ public class EssentialsBlockListener extends BlockListener
} }
@Override @Override
@Deprecated
public void onBlockBreak(BlockBreakEvent event) public void onBlockBreak(BlockBreakEvent event)
{ {
if (event.isCancelled()) if (event.isCancelled())
@ -63,6 +64,7 @@ public class EssentialsBlockListener extends BlockListener
} }
@Override @Override
@Deprecated
public void onSignChange(SignChangeEvent event) public void onSignChange(SignChangeEvent event)
{ {
if (event.isCancelled()) if (event.isCancelled())
@ -231,7 +233,7 @@ public class EssentialsBlockListener extends BlockListener
{ {
return; return;
} }
Block signBlock = event.getBlockAgainst(); /*Block signBlock = event.getBlockAgainst();
if (signBlock.getType() == Material.WALL_SIGN || signBlock.getType() == Material.SIGN_POST) if (signBlock.getType() == Material.WALL_SIGN || signBlock.getType() == Material.SIGN_POST)
{ {
Sign sign = new CraftSign(signBlock); Sign sign = new CraftSign(signBlock);
@ -240,7 +242,7 @@ public class EssentialsBlockListener extends BlockListener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} }*/
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
// Do not rely on getItemInHand(); // Do not rely on getItemInHand();
// http://leaky.bukkit.org/issues/663 // http://leaky.bukkit.org/issues/663
@ -320,7 +322,8 @@ public class EssentialsBlockListener extends BlockListener
} }
} }
public boolean hasAdjacentChest(Block block) @Deprecated
private boolean hasAdjacentChest(Block block)
{ {
Block[] faces = getAdjacentBlocks(block); Block[] faces = getAdjacentBlocks(block);
for (Block b : faces) for (Block b : faces)
@ -337,6 +340,7 @@ public class EssentialsBlockListener extends BlockListener
private static final int NOSIGN = 2; private static final int NOSIGN = 2;
private static final int OWNER = 3; private static final int OWNER = 3;
@Deprecated
private int checkProtectionSign(Block block, User user) private int checkProtectionSign(Block block, User user)
{ {
String username = user.getName().substring(0, user.getName().length() > 14 ? 14 : user.getName().length()); String username = user.getName().substring(0, user.getName().length() > 14 ? 14 : user.getName().length());
@ -371,6 +375,7 @@ public class EssentialsBlockListener extends BlockListener
return NOSIGN; return NOSIGN;
} }
@Deprecated
private static Block[] getAdjacentBlocks(Block block) private static Block[] getAdjacentBlocks(Block block)
{ {
return new Block[] return new Block[]
@ -384,7 +389,8 @@ public class EssentialsBlockListener extends BlockListener
}; };
} }
public boolean isBlockProtected(Block block, User user) @Deprecated
private boolean isBlockProtected(Block block, User user)
{ {
Block[] faces = getAdjacentBlocks(block); Block[] faces = getAdjacentBlocks(block);
boolean protect = false; boolean protect = false;
@ -421,7 +427,8 @@ public class EssentialsBlockListener extends BlockListener
return protect; return protect;
} }
public static boolean isBlockProtected(Block block) @Deprecated
private static boolean isBlockProtected(Block block)
{ {
Block[] faces = getAdjacentBlocks(block); Block[] faces = getAdjacentBlocks(block);
for (Block b : faces) for (Block b : faces)

2
Essentials/src/com/earth2me/essentials/EssentialsEcoBlockListener.java
View file

@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockListener;
import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.block.SignChangeEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@Deprecated
public class EssentialsEcoBlockListener extends BlockListener public class EssentialsEcoBlockListener extends BlockListener
{ {
private final IEssentials ess; private final IEssentials ess;

2
Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
View file

@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerListener; import org.bukkit.event.player.PlayerListener;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@Deprecated
public class EssentialsEcoPlayerListener extends PlayerListener public class EssentialsEcoPlayerListener extends PlayerListener
{ {
private final IEssentials ess; private final IEssentials ess;

9
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -357,7 +357,7 @@ public class EssentialsPlayerListener extends PlayerListener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (!ess.getSettings().areSignsDisabled() && EssentialsBlockListener.protectedBlocks.contains(event.getClickedBlock().getType())) /*if (!ess.getSettings().areSignsDisabled() && EssentialsBlockListener.protectedBlocks.contains(event.getClickedBlock().getType()))
{ {
if (!user.isAuthorized("essentials.signs.protection.override")) if (!user.isAuthorized("essentials.signs.protection.override"))
{ {
@ -368,7 +368,7 @@ public class EssentialsPlayerListener extends PlayerListener
return; return;
} }
} }
} }*/
if (ess.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK) if (ess.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK)
{ {
@ -383,7 +383,7 @@ public class EssentialsPlayerListener extends PlayerListener
} }
if (ess.getSettings().areSignsDisabled()) /*if (ess.getSettings().areSignsDisabled())
{ {
return; return;
} }
@ -517,9 +517,10 @@ public class EssentialsPlayerListener extends PlayerListener
{ {
logger.log(Level.WARNING, ex.getMessage(), ex); logger.log(Level.WARNING, ex.getMessage(), ex);
} }
} }*/
} }
@Deprecated
private Trade chargeUserForWarp(Sign sign, User user) throws Exception private Trade chargeUserForWarp(Sign sign, User user) throws Exception
{ {
if (!sign.getLine(3).isEmpty()) if (!sign.getLine(3).isEmpty())

4
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View file

@ -249,12 +249,12 @@ public class EssentialsProtectEntityListener extends EntityListener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (EssentialsBlockListener.protectedBlocks.contains(block.getType()) /*if (EssentialsBlockListener.protectedBlocks.contains(block.getType())
&& EssentialsBlockListener.isBlockProtected(block)) && EssentialsBlockListener.isBlockProtected(block))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }*/
} }
} }