Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2710 from MitchTalmadge/v3.0

Browse source 
Use Material instead of Block ID in SignChangeEvent and BlockEvent (Fixes #2699)
This commit is contained in:
mikeprimm 2019-12-20 20:38:03 -06:00 • committed by GitHub
commit 96aa816227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View file

@ -100,6 +100,7 @@ import org.dynmap.common.DynmapListenerManager.EventType;
import org.dynmap.hdmap.HDMap;
import org.dynmap.markers.MarkerAPI;
import org.dynmap.modsupport.ModSupportImpl;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.Polygon;
import org.dynmap.utils.VisibilityLimit;
@ -351,7 +352,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
Block b = evt.getBlock();
if(b == null) return; /* Work around for stupid mods.... */
Location l = b.getLocation();
core.listenerManager.processBlockEvent(EventType.BLOCK_BREAK, b.getType().getId(),
core.listenerManager.processBlockEvent(EventType.BLOCK_BREAK, b.getType().name(),
getWorld(l.getWorld()).getName(), l.getBlockX(), l.getBlockY(), l.getBlockZ());
}
}, DynmapPlugin.this);
@ -366,7 +367,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
DynmapPlayer dp = null;
Player p = evt.getPlayer();
if(p != null) dp = new BukkitPlayer(p);
core.listenerManager.processSignChangeEvent(EventType.SIGN_CHANGE, b.getType().getId(),
core.listenerManager.processSignChangeEvent(EventType.SIGN_CHANGE, b.getType().name(),
getWorld(l.getWorld()).getName(), l.getBlockX(), l.getBlockY(), l.getBlockZ(), lines, dp);
}
}, DynmapPlugin.this);
@ -1631,9 +1632,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
}));
}
@Override
public void processSignChange(int blkid, String world, int x, int y, int z,
public void processSignChange(String material, String world, int x, int y, int z,
String[] lines, String playerid) {
core.processSignChange(blkid, world, x, y, z, lines, playerid);
core.processSignChange(material, world, x, y, z, lines, playerid);
}
Polygon getWorldBorder(World w) {