mirror of
https://github.com/webbukkit/dynmap.git
synced 2024-12-25 01:57:53 +01:00
Handle events from updates on disabled worlds properly
This commit is contained in:
parent
073a277f77
commit
08d143ddcc
@ -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() {
|
||||||
|
@ -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() {
|
||||||
|
@ -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() {
|
||||||
|
@ -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();
|
||||||
|
@ -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();
|
||||||
|
@ -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();
|
||||||
|
Loading…
Reference in New Issue
Block a user