From ee6b93e208102aed1e5a6c0c01f25c07e24e0cf5 Mon Sep 17 00:00:00 2001 From: StevenLawson Date: Tue, 27 Aug 2013 07:46:25 -0400 Subject: [PATCH] Playing the memory reduction game - lets reduce the use of "new". --- .../TotalFreedomMod/TFM_RollbackManager.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java b/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java index 6064eec1..421d578e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java @@ -91,21 +91,25 @@ public class TFM_RollbackManager return 0; } - public static List getEntriesAtLocation(Location location) + public static List getEntriesAtLocation(final Location location) { - location = location.clone(); + final int testX = location.getBlockX(); + final short testY = (short) location.getBlockY(); + final int testZ = location.getBlockZ(); + final String testWorldName = location.getWorld().getName(); List entries = new ArrayList(); for (String playername : PLAYER_HISTORY_MAP.keySet()) { for (RollbackEntry entry : PLAYER_HISTORY_MAP.get(playername)) { - if (entry.getLocation().equals(location)) + if (testX == entry.x && testY == entry.y && testZ == entry.z && testWorldName.equals(entry.getWorldName())) { entries.add(0, entry); } } } + return entries; } @@ -144,9 +148,9 @@ public class TFM_RollbackManager // Use of primitives to decrease overhead private final String author; private final String worldName; - private final int x; - private final short y; - private final int z; + public final int x; + public final short y; + public final int z; private final short blockId; private final byte data; private final boolean isBreak; @@ -203,7 +207,7 @@ public class TFM_RollbackManager return x; } - public int getY() + public short getY() { return y; } @@ -236,5 +240,10 @@ public class TFM_RollbackManager block.setType(Material.AIR); } } + + public String getWorldName() + { + return worldName; + } } }