From 7985b72aafb14227aa2552734b1b5dfca2b50fe3 Mon Sep 17 00:00:00 2001 From: Robin Kupper Date: Mon, 17 Oct 2011 11:51:40 +0200 Subject: [PATCH] Tidied up session management --- src/de/diddiz/LogBlock/LBToolListener.java | 2 +- src/de/diddiz/LogBlock/LogBlock.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/de/diddiz/LogBlock/LBToolListener.java b/src/de/diddiz/LogBlock/LBToolListener.java index f3e667b..0f621d5 100644 --- a/src/de/diddiz/LogBlock/LBToolListener.java +++ b/src/de/diddiz/LogBlock/LBToolListener.java @@ -101,7 +101,7 @@ class LBToolListener extends PlayerListener @Override public void onPlayerChangedWorld(PlayerChangedWorldEvent event) { final Player player = event.getPlayer(); - final Session session = logblock.getSessions().get(player.getName().hashCode()); + final Session session = logblock.getSession(player.getName(), false); if (session != null) for (final Entry entry : session.toolData.entrySet()) { final Tool tool = entry.getKey(); diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/de/diddiz/LogBlock/LogBlock.java index 84bff86..b8425dc 100644 --- a/src/de/diddiz/LogBlock/LogBlock.java +++ b/src/de/diddiz/LogBlock/LogBlock.java @@ -41,7 +41,7 @@ public class LogBlock extends JavaPlugin private Timer timer = null; private PermissionHandler permissions = null; private boolean errorAtLoading = false; - private final Map sessions = new HashMap(); + private final Map sessions = new HashMap(); public Config getLBConfig() { return config; @@ -297,15 +297,15 @@ public class LogBlock extends JavaPlugin } } - public Map getSessions() { - return sessions; + public Session getSession(String playerName) { + return getSession(playerName, true); } - public Session getSession(String playerName) { - Session session = sessions.get(playerName.hashCode()); - if (session == null) { + public Session getSession(String playerName, boolean create) { + Session session = sessions.get(playerName.toLowerCase()); + if (session == null && create) { session = new Session(this, getServer().getPlayer(playerName)); - sessions.put(playerName.hashCode(), session); + sessions.put(playerName.toLowerCase(), session); } return session; }