twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-08 16:12:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting.

Browse Source
This commit is contained in:
Erik Broes
2012-01-14 23:02:10 +01:00
parent 61ec751ca1
commit a4ce846d07
68 changed files with 322 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -135,7 +135,7 @@ public final class CraftServer implements Server {
}
private File getConfigFile() {
return (File)console.options.valueOf("bukkit-settings");
return (File) console.options.valueOf("bukkit-settings");
}
private void saveConfig() {
@@ -372,7 +372,6 @@ public final class CraftServer implements Server {
return server;
}
// NOTE: Should only be called from MinecraftServer.b()
public boolean dispatchCommand(CommandSender sender, ServerCommand serverCommand) {
return dispatchCommand(sender, serverCommand.command);
@@ -457,7 +456,7 @@ public final class CraftServer implements Server {
Map<String, Map<String, Object>> perms;
try {
perms = (Map<String, Map<String, Object>>)yaml.load(stream);
perms = (Map<String, Map<String, Object>>) yaml.load(stream);
} catch (MarkedYAMLException ex) {
getLogger().log(Level.WARNING, "Server permissions file " + file + " is not valid YAML: " + ex.toString());
return;
@@ -557,7 +556,7 @@ public final class CraftServer implements Server {
}
pluginManager.callEvent(new WorldInitEvent(internal.getWorld()));
System.out.print("Preparing start region for level " + (console.worlds.size() -1) + " (Seed: " + internal.getSeed() + ")");
System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
if (internal.getWorld().getKeepSpawnInMemory()) {
short short1 = 196;
@@ -811,7 +810,7 @@ public final class CraftServer implements Server {
for (Permissible permissible : permissibles) {
if (permissible instanceof CommandSender) {
CommandSender user = (CommandSender)permissible;
CommandSender user = (CommandSender) permissible;
user.sendMessage(message);
count++;
}
@@ -854,7 +853,7 @@ public final class CraftServer implements Server {
Set<OfflinePlayer> result = new HashSet<OfflinePlayer>();
for (Object name : server.banByName) {
result.add(getOfflinePlayer((String)name));
result.add(getOfflinePlayer((String) name));
}
return result;
@@ -869,7 +868,7 @@ public final class CraftServer implements Server {
Set<OfflinePlayer> result = new HashSet<OfflinePlayer>();
for (Object name : server.getWhitelisted()) {
result.add(getOfflinePlayer((String)name));
result.add(getOfflinePlayer((String) name));
}
return result;
@@ -879,7 +878,7 @@ public final class CraftServer implements Server {
Set<OfflinePlayer> result = new HashSet<OfflinePlayer>();
for (Object name : server.operators) {
result.add(getOfflinePlayer((String)name));
result.add(getOfflinePlayer((String) name));
}
return result;
@@ -899,7 +898,7 @@ public final class CraftServer implements Server {
}
for (World world : getWorlds()) {
((CraftWorld)world).getHandle().worldData.setGameType(mode.getValue());
((CraftWorld) world).getHandle().worldData.setGameType(mode.getValue());
}
}
@@ -910,16 +909,15 @@ public final class CraftServer implements Server {
public void detectListNameConflict(EntityPlayer entityPlayer) {
// Collisions will make for invisible people
for (int i = 0; i < getHandle().players.size(); ++i) {
EntityPlayer testEntityPlayer = (EntityPlayer)getHandle().players.get(i);
EntityPlayer testEntityPlayer = (EntityPlayer) getHandle().players.get(i);
// We have a problem!
if (testEntityPlayer != entityPlayer && testEntityPlayer.listName.equals(entityPlayer.listName)) {
String oldName = entityPlayer.listName;
int spaceLeft = 16 - oldName.length();
if (spaceLeft <= 1) { // We also hit the list name length limit!
entityPlayer.listName = oldName.subSequence(0, oldName.length() - 2 - spaceLeft)
+ String.valueOf(System.currentTimeMillis() % 99);
if (spaceLeft <= 1) { // We also hit the list name length limit!
entityPlayer.listName = oldName.subSequence(0, oldName.length() - 2 - spaceLeft) + String.valueOf(System.currentTimeMillis() % 99);
} else {
entityPlayer.listName = oldName + String.valueOf(System.currentTimeMillis() % 99);
}