minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 12:31:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/essentials/Essentials

Browse Source
This commit is contained in:
Iaccidentally
2012-06-26 15:15:48 -04:00
parent ce740d6bd2 a46f194832
commit 99a2ddee6f
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@@ -243,7 +243,7 @@ public class Essentials extends JavaPlugin implements IEssentials
pm.registerEvents(tntListener, this); pm.registerEvents(tntListener, this);
final EssentialsTimer timer = new EssentialsTimer(this); timer = new EssentialsTimer(this);
getServer().getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100); getServer().getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
execTimer.mark("RegListeners"); execTimer.mark("RegListeners");

2
Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java
View File

@@ -180,7 +180,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE
acquireReadLock(); acquireReadLock();
try try
{ {
return getData().getNewPlayerAnnouncement().replace('&', '<EFBFBD>').replace("<EFBFBD><EFBFBD>", "&").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 finally
{ {

6
Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java
View File

@@ -8,7 +8,7 @@ import java.util.Set;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.CreatureType; import org.bukkit.entity.EntityType;
@Data @Data
@@ -39,7 +39,7 @@ public class Prevent implements StorageObject
"permission essentials.protect.entitytarget.bypass disables this" "permission essentials.protect.entitytarget.bypass disables this"
}) })
private boolean entitytarget = false; private boolean entitytarget = false;
@MapKeyType(CreatureType.class) @MapKeyType(EntityType.class)
@MapValueType(Boolean.class) @MapValueType(Boolean.class)
private Map<CreatureType, Boolean> spawn = new HashMap<CreatureType, Boolean>(); private Map<EntityType, Boolean> spawn = new HashMap<EntityType, Boolean>();
} }

14
Essentials/src/com/earth2me/essentials/user/User.java
View File

@@ -212,14 +212,6 @@ public class User extends UserBase implements IUser
unlock(); unlock();
} }
} }
public void requestTeleport(final User player, final boolean here)
{
teleportRequestTime = System.currentTimeMillis();
teleportRequester = player;
tpRequestHere = here;
}
public String getNick(boolean addprefixsuffix) public String getNick(boolean addprefixsuffix)
{ {
acquireReadLock(); acquireReadLock();
@@ -583,9 +575,11 @@ public class User extends UserBase implements IUser
} }
@Override @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 @Override

6
Essentials/src/com/earth2me/essentials/utils/textreader/TextInput.java
View File

@@ -85,9 +85,9 @@ public class TextInput implements IText
if (line.length() > 0 && line.charAt(0) == '#') if (line.length() > 0 && line.charAt(0) == '#')
{ {
bookmarks.put(line.substring(1).toLowerCase(Locale.ENGLISH).replaceAll("&[0-9a-fk]", ""), lineNumber); bookmarks.put(line.substring(1).toLowerCase(Locale.ENGLISH).replaceAll("&[0-9a-fk]", ""), lineNumber);
chapters.add(line.substring(1).replace('&', '<EFBFBD>').replace("<EFBFBD>", "&")); chapters.add(line.substring(1).replace('&', '§').replace("§", "&"));
} }
lines.add(line.replace('&', '<EFBFBD>').replace("<EFBFBD>", "&")); lines.add(line.replace('&', '§').replace("§", "&"));
lineNumber++; lineNumber++;
} }
} }
@@ -119,7 +119,9 @@ public class TextInput implements IText
} }
finally finally
{ {
if(output != null)
output.close(); output.close();
if(input != null)
input.close(); input.close();
} }
throw new FileNotFoundException("File " + filename + ".txt does not exist. Creating one for you."); throw new FileNotFoundException("File " + filename + ".txt does not exist. Creating one for you.");

6
EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java
View File

@@ -187,10 +187,10 @@ public class UpdateCheck
private int getBukkitVersion() 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()); 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()) if (versionMatch.matches())
{ {
return Integer.parseInt(versionMatch.group(4)); return Integer.parseInt(versionMatch.group(1));
} }
throw new NumberFormatException("Bukkit Version changed!"); throw new NumberFormatException("Bukkit Version changed!");
} }