From d1dad4fca529221bfd8fb42dcc12714f86177eed Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 26 Jun 2012 11:36:54 +0100 Subject: [PATCH 1/5] change pattern match for essentials update --- .../src/com/earth2me/essentials/update/UpdateCheck.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java index 29afc4d3f..98426ce58 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java +++ b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java @@ -187,10 +187,10 @@ public class UpdateCheck private int getBukkitVersion() { - final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(plugin.getServer().getVersion()); - if (versionMatch.matches()) + final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(plugin.getServer().getVersion()); + if (versionMatch.matches()) { - return Integer.parseInt(versionMatch.group(4)); + return Integer.parseInt(versionMatch.group(1)); } throw new NumberFormatException("Bukkit Version changed!"); } From 845fa008567974e51fb040b961163aa912965b27 Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 26 Jun 2012 13:21:48 +0100 Subject: [PATCH 2/5] =?UTF-8?q?fix=20some=20encoding=20issues=20for=20?= =?UTF-8?q?=C2=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't attempt to close on null objects --- .../src/com/earth2me/essentials/settings/SpawnsHolder.java | 2 +- .../com/earth2me/essentials/utils/textreader/TextInput.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java index c1826d9ef..816262a8e 100644 --- a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java +++ b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java @@ -180,7 +180,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder implements IE acquireReadLock(); try { - return getData().getNewPlayerAnnouncement().replace('&', '�').replace("��", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString()); + return getData().getNewPlayerAnnouncement().replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString()); } finally { diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java b/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java index 8c8b7faca..a8a8598d1 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java +++ b/Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java @@ -85,9 +85,9 @@ public class TextInput implements IText if (line.length() > 0 && line.charAt(0) == '#') { bookmarks.put(line.substring(1).toLowerCase(Locale.ENGLISH).replaceAll("&[0-9a-fk]", ""), lineNumber); - chapters.add(line.substring(1).replace('&', '�').replace("�", "&")); + chapters.add(line.substring(1).replace('&', '§').replace("§", "&")); } - lines.add(line.replace('&', '�').replace("�", "&")); + lines.add(line.replace('&', '§').replace("§", "&")); lineNumber++; } } @@ -119,7 +119,9 @@ public class TextInput implements IText } finally { + if(output != null) output.close(); + if(input != null) input.close(); } throw new FileNotFoundException("File " + filename + ".txt does not exist. Creating one for you."); From 88d8a9cee21b172c347bf0f76734607370db7f58 Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 26 Jun 2012 13:37:38 +0100 Subject: [PATCH 3/5] remove deprecated code --- .../com/earth2me/essentials/settings/protect/Prevent.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java b/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java index 192e93ac1..0713237dd 100644 --- a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java +++ b/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java @@ -8,7 +8,7 @@ import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; import org.bukkit.Material; -import org.bukkit.entity.CreatureType; +import org.bukkit.entity.EntityType; @Data @@ -39,7 +39,7 @@ public class Prevent implements StorageObject "permission essentials.protect.entitytarget.bypass disables this" }) private boolean entitytarget = false; - @MapKeyType(CreatureType.class) + @MapKeyType(EntityType.class) @MapValueType(Boolean.class) - private Map spawn = new HashMap(); + private Map spawn = new HashMap(); } \ No newline at end of file From 39c8355ed789abf713a81c215a32916b704ab036 Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 26 Jun 2012 14:23:37 +0100 Subject: [PATCH 4/5] implement request teleport --- .../src/com/earth2me/essentials/user/User.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java index 9df3507df..bedfd44f2 100644 --- a/Essentials/src/com/earth2me/essentials/user/User.java +++ b/Essentials/src/com/earth2me/essentials/user/User.java @@ -212,14 +212,6 @@ public class User extends UserBase implements IUser unlock(); } } - - public void requestTeleport(final User player, final boolean here) - { - teleportRequestTime = System.currentTimeMillis(); - teleportRequester = player; - tpRequestHere = here; - } - public String getNick(boolean addprefixsuffix) { acquireReadLock(); @@ -583,9 +575,11 @@ public class User extends UserBase implements IUser } @Override - public void requestTeleport(IUser user, boolean b) + public void requestTeleport(IUser player, boolean here) { - throw new UnsupportedOperationException("Not supported yet."); + teleportRequestTime = System.currentTimeMillis(); + teleportRequester = player; + tpRequestHere = here; } @Override From a46f194832f8467a63bbef0e6b7c4a2596d89162 Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 26 Jun 2012 14:40:54 +0100 Subject: [PATCH 5/5] Assign EssentialsTimer to the declared variable. Fixes gc --- Essentials/src/com/earth2me/essentials/Essentials.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index ee9926abe..1095443c5 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -243,7 +243,7 @@ public class Essentials extends JavaPlugin implements IEssentials pm.registerEvents(tntListener, this); - final EssentialsTimer timer = new EssentialsTimer(this); + timer = new EssentialsTimer(this); getServer().getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100); execTimer.mark("RegListeners");