Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Add workaround for bogus Bukkit piston events (http://leaky.bukkit.org/issues/1227)

Browse Source
This commit is contained in:
Mike Primm 2011-09-12 09:55:55 +08:00 committed by mikeprimm
parent e2746b7cbc
commit 3076b28c24
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/dynmap/DynmapPlugin.java
View File

@ -18,6 +18,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -478,9 +479,14 @@ public class DynmapPlugin extends JavaPlugin {
Block b = event.getBlock(); Block b = event.getBlock();
Location loc = b.getLocation(); Location loc = b.getLocation();
mapManager.sscache.invalidateSnapshot(loc); mapManager.sscache.invalidateSnapshot(loc);
BlockFace dir = event.getDirection(); BlockFace dir;
try { /* Workaround Bukkit bug = http://leaky.bukkit.org/issues/1227 */
dir = event.getDirection();
} catch (ClassCastException ccx) {
dir = BlockFace.NORTH;
}
if(onpiston) { if(onpiston) {
mapManager.touchVolume(loc, b.getRelative(dir, 2).getLocation()); mapManager.touchVolume(loc, b.getRelative(dir, 2).getLocation());
} }
for(int i = 0; i < 2; i++) { for(int i = 0; i < 2; i++) {
b = b.getRelative(dir, 1); b = b.getRelative(dir, 1);
@ -492,9 +498,17 @@ public class DynmapPlugin extends JavaPlugin {
if(event.isCancelled()) if(event.isCancelled())
return; return;
Block b = event.getBlock(); Block b = event.getBlock();
/* Avoid bogus piston events from Bukkit */
if((b.getType() != Material.PISTON_BASE) && (b.getType() != Material.PISTON_STICKY_BASE))
return;
Location loc = b.getLocation(); Location loc = b.getLocation();
mapManager.sscache.invalidateSnapshot(loc); mapManager.sscache.invalidateSnapshot(loc);
BlockFace dir = event.getDirection(); BlockFace dir;
try { /* Workaround Bukkit bug = http://leaky.bukkit.org/issues/1227 */
dir = event.getDirection();
} catch (ClassCastException ccx) {
dir = BlockFace.NORTH;
}
if(onpiston) { if(onpiston) {
mapManager.touchVolume(loc, b.getRelative(dir, 1+event.getLength()).getLocation()); mapManager.touchVolume(loc, b.getRelative(dir, 1+event.getLength()).getLocation());
} }