From a1d7805116666f64c18f27d8d45b6133e11f1dbd Mon Sep 17 00:00:00 2001 From: Jason Booth Date: Wed, 23 Feb 2011 17:07:04 -0600 Subject: [PATCH] Fix for NPE JsonTimerTask.java using wrong playerList Removed unused PlayerList variable in MapManager.java --- src/main/java/org/dynmap/JsonTimerTask.java | 2 +- src/main/java/org/dynmap/MapManager.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java index 1c355b0f..4fece6ef 100644 --- a/src/main/java/org/dynmap/JsonTimerTask.java +++ b/src/main/java/org/dynmap/JsonTimerTask.java @@ -35,7 +35,7 @@ class JsonTimerTask extends TimerTask { update.timestamp = current; update.servertime = world.getTime() % 24000; - Player[] players = mapManager.playerList.getVisiblePlayers(); + Player[] players = plugin.playerList.getVisiblePlayers(); update.players = new Client.Player[players.length]; for (int i = 0; i < players.length; i++) { Player p = players[i]; diff --git a/src/main/java/org/dynmap/MapManager.java b/src/main/java/org/dynmap/MapManager.java index aa24dffb..4d4f4eb1 100644 --- a/src/main/java/org/dynmap/MapManager.java +++ b/src/main/java/org/dynmap/MapManager.java @@ -24,8 +24,6 @@ public class MapManager { public Map worlds = new HashMap(); public Map inactiveworlds = new HashMap(); - public PlayerList playerList; - /* lock for our data structures */ public static final Object lock = new Object();