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

Handle events from updates on disabled worlds properly

Browse source
This commit is contained in:
Mike Primm 2020-07-09 12:47:28 -05:00
parent 06f149f731
commit a70d091d9a
6 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/DynmapPlugin.java
View file

@ -1682,6 +1682,7 @@ public class DynmapPlugin
World w = event.getWorld(); World w = event.getWorld();
if(!(w instanceof WorldServer)) return; if(!(w instanceof WorldServer)) return;
final ForgeWorld fw = getWorld(w); final ForgeWorld fw = getWorld(w);
if (fw == null) return;
// This event can be called from off server thread, so push processing there // This event can be called from off server thread, so push processing there
core.getServer().scheduleServerTask(new Runnable() { core.getServer().scheduleServerTask(new Runnable() {
public void run() { public void run() {

1
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View file

@ -1689,6 +1689,7 @@ public class DynmapPlugin
World w = event.getWorld(); World w = event.getWorld();
if(!(w instanceof WorldServer)) return; if(!(w instanceof WorldServer)) return;
final ForgeWorld fw = getWorld(w); final ForgeWorld fw = getWorld(w);
if (fw == null) return;
// This event can be called from off server thread, so push processing there // This event can be called from off server thread, so push processing there
core.getServer().scheduleServerTask(new Runnable() { core.getServer().scheduleServerTask(new Runnable() {
public void run() { public void run() {

1
forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
View file

@ -1656,6 +1656,7 @@ public class DynmapPlugin
IWorld w = event.getWorld(); IWorld w = event.getWorld();
if(!(w instanceof WorldServer)) return; if(!(w instanceof WorldServer)) return;
final ForgeWorld fw = getWorld(w); final ForgeWorld fw = getWorld(w);
if (fw == null) return;
// This event can be called from off server thread, so push processing there // This event can be called from off server thread, so push processing there
core.getServer().scheduleServerTask(new Runnable() { core.getServer().scheduleServerTask(new Runnable() {
public void run() { public void run() {

2
forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java
View file

@ -1682,6 +1682,7 @@ public class DynmapPlugin
IWorld w = event.getWorld(); IWorld w = event.getWorld();
if(!(w instanceof ServerWorld)) return; if(!(w instanceof ServerWorld)) return;
final ForgeWorld fw = getWorld(w); final ForgeWorld fw = getWorld(w);
if (fw == null) return;
// This event can be called from off server thread, so push processing there // This event can be called from off server thread, so push processing there
core.getServer().scheduleServerTask(new Runnable() { core.getServer().scheduleServerTask(new Runnable() {
public void run() { public void run() {
@ -1794,6 +1795,7 @@ public class DynmapPlugin
BlockUpdateRec r = new BlockUpdateRec(); BlockUpdateRec r = new BlockUpdateRec();
r.w = event.getWorld(); r.w = event.getWorld();
ForgeWorld fw = getWorld(r.w, false); ForgeWorld fw = getWorld(r.w, false);
if (fw == null) return;
r.wid = fw.getName(); r.wid = fw.getName();
BlockPos p = event.getPos(); BlockPos p = event.getPos();
r.x = p.getX(); r.x = p.getX();

2
forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java
View file

@ -1682,6 +1682,7 @@ public class DynmapPlugin
IWorld w = event.getWorld(); IWorld w = event.getWorld();
if(!(w instanceof ServerWorld)) return; if(!(w instanceof ServerWorld)) return;
final ForgeWorld fw = getWorld(w); final ForgeWorld fw = getWorld(w);
if (fw == null) return;
// This event can be called from off server thread, so push processing there // This event can be called from off server thread, so push processing there
core.getServer().scheduleServerTask(new Runnable() { core.getServer().scheduleServerTask(new Runnable() {
public void run() { public void run() {
@ -1794,6 +1795,7 @@ public class DynmapPlugin
BlockUpdateRec r = new BlockUpdateRec(); BlockUpdateRec r = new BlockUpdateRec();
r.w = event.getWorld(); r.w = event.getWorld();
ForgeWorld fw = getWorld(r.w, false); ForgeWorld fw = getWorld(r.w, false);
if (fw == null) return;
r.wid = fw.getName(); r.wid = fw.getName();
BlockPos p = event.getPos(); BlockPos p = event.getPos();
r.x = p.getX(); r.x = p.getX();

1
forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
View file

@ -1791,6 +1791,7 @@ public class DynmapPlugin
BlockUpdateRec r = new BlockUpdateRec(); BlockUpdateRec r = new BlockUpdateRec();
r.w = event.getWorld(); r.w = event.getWorld();
ForgeWorld fw = getWorld(r.w, false); ForgeWorld fw = getWorld(r.w, false);
if (fw == null) return;
r.wid = fw.getName(); r.wid = fw.getName();
BlockPos p = event.getPos(); BlockPos p = event.getPos();
r.x = p.getX(); r.x = p.getX();