Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-30 14:33:47 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the block lag fix not allowing the destruction of leaves.

Browse Source
This commit is contained in:
sk89q 2010-11-17 19:34:06 -08:00
parent e5dcb557dc
commit a7aed1a278
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/WorldGuardListener.java
View File

@ -27,6 +27,7 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList;
import java.util.Random; import java.util.Random;
import java.io.*; import java.io.*;
import com.sk89q.worldguard.*; import com.sk89q.worldguard.*;
@ -42,14 +43,19 @@ public class WorldGuardListener extends PluginListener {
* Logger. * Logger.
*/ */
private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard"); private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
/**
* Random number generator.
*/
private static Random rand = new Random();
/** /**
* Properties file for CraftBook. * Properties file for CraftBook.
*/ */
private PropertiesFile properties = new PropertiesFile("worldguard.properties"); private PropertiesFile properties = new PropertiesFile("worldguard.properties");
/** /**
* Random number generator. * List of blocks to remove when possible.
*/ */
private static Random rand = new Random(); private LinkedList<int[]> blockRemoveQueue = new LinkedList<int[]>();
private boolean enforceOneSession; private boolean enforceOneSession;
private boolean blockCreepers; private boolean blockCreepers;
@ -187,6 +193,11 @@ public boolean onBlockCreate(Player player, Block blockPlaced, Block blockClicke
BlacklistEntry entry = blacklist.get(itemInHand); BlacklistEntry entry = blacklist.get(itemInHand);
if (entry != null) { if (entry != null) {
if (!entry.onRightClick(itemInHand, player)) { if (!entry.onRightClick(itemInHand, player)) {
// Water/lava bucket fix
if (itemInHand == 326 || itemInHand == 327) {
blockPlaced.setType(0);
blockPlaced.update();
}
return true; return true;
} }
} }
@ -267,9 +278,9 @@ else if (type == 18) { // Leaves
else if (type == 83) { dropped = 338; count = 4; } // Reed else if (type == 83) { dropped = 338; count = 4; } // Reed
else if (type == 89) { dropped = 348; } // Lightstone else if (type == 89) { dropped = 348; } // Lightstone
if (dropped > 0) { etc.getServer().setBlockAt(0, block.getX(), block.getY(), block.getZ());
etc.getServer().setBlockAt(0, block.getX(), block.getY(), block.getZ());
if (dropped > 0) {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
etc.getServer().dropItem(block.getX(), block.getY(), block.getZ(), etc.getServer().dropItem(block.getX(), block.getY(), block.getZ(),
dropped, i); dropped, i);