SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting.

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot
2012-01-14 23:02:10 +01:00
parent 62e770d489
commit 7c345d4d82
39 changed files with 266 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
paper-server/src/main/java/org/bukkit/craftbukkit/util/EntryBase.java
View File

@@ -1,7 +1,8 @@
package org.bukkit.craftbukkit.util;
public class EntryBase {
public class EntryBase {
protected long key;
public EntryBase(long key) {
this.key = key;
}

8
paper-server/src/main/java/org/bukkit/craftbukkit/util/LongBaseHashtable.java
View File

@@ -84,7 +84,7 @@ public class LongBaseHashtable extends LongHash {
if (inner[i].key == key) {
for (i++; i < inner.length; i++) {
if (inner[i] == null) break;
inner[i-1] = inner[i];
inner[i - 1] = inner[i];
}
inner[i-1] = null;
@@ -97,13 +97,13 @@ public class LongBaseHashtable extends LongHash {
public synchronized ArrayList<EntryBase> entries() {
ArrayList<EntryBase> ret = new ArrayList<EntryBase>();
for (EntryBase[][] outer: this.values) {
for (EntryBase[][] outer : this.values) {
if (outer == null) continue;
for (EntryBase[] inner: outer) {
for (EntryBase[] inner : outer) {
if (inner == null) continue;
for (EntryBase entry: inner) {
for (EntryBase entry : inner) {
if (entry == null) break;
ret.add(entry);

10
paper-server/src/main/java/org/bukkit/craftbukkit/util/LongHashset.java
View File

@@ -71,7 +71,7 @@ public class LongHashset extends LongHash {
long[] inner = outer[(int) ((key >> 32) & 255)];
if (inner == null) return false;
for (long entry: inner) {
for (long entry : inner) {
if (entry == key) return true;
}
return false;
@@ -134,7 +134,7 @@ public class LongHashset extends LongHash {
rl.lock();
try {
long[] ret = new long[this.count];
for (long[][] outer: this.values) {
for (long[][] outer : this.values) {
if (outer == null) continue;
for (int oIdx = outer.length - 1; oIdx >= 0; oIdx--) {
@@ -159,13 +159,13 @@ public class LongHashset extends LongHash {
rl.lock();
try {
long[] ret = new long[this.count];
for (long[][] outer: this.values) {
for (long[][] outer : this.values) {
if (outer == null) continue;
for (long[] inner: outer) {
for (long[] inner : outer) {
if (inner == null) continue;
for (long entry: inner) {
for (long entry : inner) {
ret[index++] = entry;
}
}

3
paper-server/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java
View File

@@ -28,7 +28,7 @@ public class LongHashtable<V> extends LongBaseHashtable {
ArrayList<EntryBase> entries = entries();
for(EntryBase entry : entries) {
for (EntryBase entry : entries) {
ret.add(((Entry) entry).value);
}
return ret;
@@ -36,6 +36,7 @@ public class LongHashtable<V> extends LongBaseHashtable {
private class Entry extends EntryBase {
V value;
Entry(long k, V v) {
super(k);
this.value = v;

1
paper-server/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.craftbukkit.util;
import net.minecraft.server.MinecraftServer;

8
paper-server/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
View File

@@ -10,20 +10,20 @@ import org.bukkit.Bukkit;
public final class Versioning {
public static String getBukkitVersion() {
String result = "Unknown-Version";
InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.bukkit/bukkit/pom.properties");
Properties properties = new Properties();
if (stream != null) {
try {
properties.load(stream);
result = properties.getProperty("version");
} catch (IOException ex) {
Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get Bukkit version!", ex);
}
}
return result;
}
}