SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Remove LocalLanguage patch for now

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2013-07-02 13:14:40 +10:00
Ursprung 5d790af909
Commit 4d2619f099
28 geänderte Dateien mit 108 neuen und 359 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

21
CraftBukkit-Patches/0001-POM-Changes.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 40b3f27d6135511d5061142bf55a0d9ae3c6722b Mon Sep 17 00:00:00 2001
From 29ade3ffce7ddfd6bef211f8f976b6703d42606e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:34:54 +1000
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 7257f87..88b41b1 100644
index 7257f87..75ef3c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@ -59,17 +59,8 @@ index 7257f87..88b41b1 100644
<repositories>
<repository>
<id>repobo-snap</id>
@@ -42,17 +31,10 @@
</repository>
</repositories>
@@ -51,8 +40,8 @@
- <pluginRepositories>
- <pluginRepository>
- <id>bukkit-plugins</id>
- <url>http://repo.bukkit.org/content/groups/public</url>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies>
<dependency>
- <groupId>org.bukkit</groupId>
@ -79,7 +70,7 @@ index 7257f87..88b41b1 100644
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -145,18 +127,23 @@
@@ -145,18 +134,23 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
@ -105,7 +96,7 @@ index 7257f87..88b41b1 100644
<outputPostfix></outputPostfix>
</configuration>
<executions>
@@ -210,7 +197,7 @@
@@ -210,7 +204,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>

194
CraftBukkit-Patches/0002-mc-dev-imports.patch
Datei anzeigen

@ -1,140 +1,70 @@
From 2f645c30fe0f5d24496ff2b921509a7ed6d12061 Mon Sep 17 00:00:00 2001
From e3f0ba44ba4ca8cc3efb38676f6da12252f1833a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 10 Apr 2013 13:52:52 +1000
Date: Tue, 2 Jul 2013 13:13:29 +1000
Subject: [PATCH] mc-dev imports
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
new file mode 100644
index 0000000..d88f864
index 0000000..aa937fb
--- /dev/null
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -0,0 +1,141 @@
@@ -0,0 +1,73 @@
+package net.minecraft.server;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.io.InputStream;
+import java.util.IllegalFormatException;
+import java.util.Properties;
+import java.util.TreeMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
+
+public class LocaleLanguage {
+
+ private static LocaleLanguage a = new LocaleLanguage("en_US");
+ private Properties b = new Properties();
+ private TreeMap c;
+ private TreeMap d = new TreeMap();
+ private String e;
+ private boolean f;
+
+ public LocaleLanguage(String s) {
+ this.e();
+ this.a(s, false);
+ }
+
+ public static LocaleLanguage a() {
+ return a;
+ }
+
+ private void e() {
+ TreeMap treemap = new TreeMap();
+ private static final Pattern a = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
+ private static final Splitter b = Splitter.on('=').limit(2);
+ private static LocaleLanguage c = new LocaleLanguage();
+ private Map d = Maps.newHashMap();
+
+ public LocaleLanguage() {
+ try {
+ BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(LocaleLanguage.class.getResourceAsStream("/lang/languages.txt"), "UTF-8"));
+ InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang");
+ Iterator iterator = IOUtils.readLines(inputstream, Charsets.UTF_8).iterator();
+
+ for (String s = bufferedreader.readLine(); s != null; s = bufferedreader.readLine()) {
+ String[] astring = s.trim().split("=");
+ while (iterator.hasNext()) {
+ String s = (String) iterator.next();
+
+ if (!s.isEmpty() && s.charAt(0) != 35) {
+ String[] astring = (String[]) Iterables.toArray(b.split(s), String.class);
+
+ if (astring != null && astring.length == 2) {
+ treemap.put(astring[0], astring[1]);
+ }
+ }
+ } catch (IOException ioexception) {
+ ioexception.printStackTrace();
+ return;
+ }
+ String s1 = astring[0];
+ String s2 = a.matcher(astring[1]).replaceAll("%$1s");
+
+ this.c = treemap;
+ this.c.put("en_US", "English (US)");
+ }
+
+ public TreeMap b() {
+ return this.c;
+ }
+
+ private void a(Properties properties, String s) throws IOException {
+ BufferedReader bufferedreader = null;
+
+ if (this.d.containsKey(s)) {
+ bufferedreader = new BufferedReader(new FileReader((File) this.d.get(s)));
+ } else {
+ bufferedreader = new BufferedReader(new InputStreamReader(LocaleLanguage.class.getResourceAsStream("/lang/" + s + ".lang"), "UTF-8"));
+ }
+
+ for (String s1 = bufferedreader.readLine(); s1 != null; s1 = bufferedreader.readLine()) {
+ s1 = s1.trim();
+ if (!s1.startsWith("#")) {
+ String[] astring = s1.split("=");
+
+ if (astring != null && astring.length == 2) {
+ properties.setProperty(astring[0], astring[1]);
+ this.d.put(s1, s2);
+ }
+ }
+ }
+ }
+
+ public synchronized void a(String s, boolean flag) {
+ if (flag || !s.equals(this.e)) {
+ Properties properties = new Properties();
+
+ try {
+ this.a(properties, "en_US");
+ } catch (IOException ioexception) {
+ ;
+ }
+
+ this.f = false;
+ if (!"en_US".equals(s)) {
+ try {
+ this.a(properties, s);
+ Enumeration enumeration = properties.propertyNames();
+
+ while (enumeration.hasMoreElements() && !this.f) {
+ Object object = enumeration.nextElement();
+ Object object1 = properties.get(object);
+
+ if (object1 != null) {
+ String s1 = object1.toString();
+
+ for (int i = 0; i < s1.length(); ++i) {
+ if (s1.charAt(i) >= 256) {
+ this.f = true;
+ break;
+ }
+ }
+ }
+ }
+ } catch (IOException ioexception1) {
+ ioexception1.printStackTrace();
+ return;
+ }
+ }
+
+ this.e = s;
+ this.b = properties;
+ }
+ static LocaleLanguage a() {
+ return c;
+ }
+
+ public synchronized String a(String s) {
+ return this.b.getProperty(s, s);
+ return this.c(s);
+ }
+
+ public synchronized String a(String s, Object... aobject) {
+ String s1 = this.b.getProperty(s, s);
+ String s1 = this.c(s);
+
+ try {
+ return String.format(s1, aobject);
@ -143,17 +73,19 @@ index 0000000..d88f864
+ }
+ }
+
+ public synchronized boolean b(String s) {
+ return this.b.containsKey(s);
+ private String c(String s) {
+ String s1 = (String) this.d.get(s);
+
+ return s1 == null ? s : s1;
+ }
+
+ public synchronized String c(String s) {
+ return this.b.getProperty(s + ".name", "");
+ public synchronized boolean b(String s) {
+ return this.d.containsKey(s);
+ }
+}
diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
new file mode 100644
index 0000000..52a70a1
index 0000000..acf8838
--- /dev/null
+++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
@@ -0,0 +1,56 @@
@ -161,7 +93,7 @@ index 0000000..52a70a1
+
+public class NextTickListEntry implements Comparable {
+
+ private static long g = 0L;
+ private static long g;
+ public int a;
+ public int b;
+ public int c;
@ -387,14 +319,14 @@ index 0000000..53c1cb5
+}
diff --git a/src/main/java/net/minecraft/server/Packet63WorldParticles.java b/src/main/java/net/minecraft/server/Packet63WorldParticles.java
new file mode 100644
index 0000000..3ef5af3
index 0000000..d7f4d2a
--- /dev/null
+++ b/src/main/java/net/minecraft/server/Packet63WorldParticles.java
@@ -0,0 +1,51 @@
+package net.minecraft.server;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
+
+public class Packet63WorldParticles extends Packet {
+
@ -410,28 +342,28 @@ index 0000000..3ef5af3
+
+ public Packet63WorldParticles() {}
+
+ public void a(DataInputStream datainputstream) throws java.io.IOException {
+ this.a = a(datainputstream, 64);
+ this.b = datainputstream.readFloat();
+ this.c = datainputstream.readFloat();
+ this.d = datainputstream.readFloat();
+ this.e = datainputstream.readFloat();
+ this.f = datainputstream.readFloat();
+ this.g = datainputstream.readFloat();
+ this.h = datainputstream.readFloat();
+ this.i = datainputstream.readInt();
+ public void a(DataInput datainput) {
+ this.a = a(datainput, 64);
+ this.b = datainput.readFloat();
+ this.c = datainput.readFloat();
+ this.d = datainput.readFloat();
+ this.e = datainput.readFloat();
+ this.f = datainput.readFloat();
+ this.g = datainput.readFloat();
+ this.h = datainput.readFloat();
+ this.i = datainput.readInt();
+ }
+
+ public void a(DataOutputStream dataoutputstream) throws java.io.IOException {
+ a(this.a, dataoutputstream);
+ dataoutputstream.writeFloat(this.b);
+ dataoutputstream.writeFloat(this.c);
+ dataoutputstream.writeFloat(this.d);
+ dataoutputstream.writeFloat(this.e);
+ dataoutputstream.writeFloat(this.f);
+ dataoutputstream.writeFloat(this.g);
+ dataoutputstream.writeFloat(this.h);
+ dataoutputstream.writeInt(this.i);
+ public void a(DataOutput dataoutput) {
+ a(this.a, dataoutput);
+ dataoutput.writeFloat(this.b);
+ dataoutput.writeFloat(this.c);
+ dataoutput.writeFloat(this.d);
+ dataoutput.writeFloat(this.e);
+ dataoutput.writeFloat(this.f);
+ dataoutput.writeFloat(this.g);
+ dataoutput.writeFloat(this.h);
+ dataoutput.writeInt(this.i);
+ }
+
+ public void handle(Connection connection) {

6
CraftBukkit-Patches/0025-Netty.patch
Datei anzeigen

@ -1,14 +1,14 @@
From a909284799fb1461906c4cc9fa866b391e16972e Mon Sep 17 00:00:00 2001
From 7d3f53604070911698fd4ce332c7764d78766873 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:06:29 +1000
Subject: [PATCH] Netty
diff --git a/pom.xml b/pom.xml
index 88b41b1..cb5e36d 100644
index 75ef3c9..2d8b3f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,16 @@
@@ -139,6 +139,16 @@
<artifactId>trove4j</artifactId>
<version>3.0.3</version>
</dependency>

174
CraftBukkit-Patches/0036-Cache-Translation-Storage.patch
Datei anzeigen

@ -1,174 +0,0 @@
From c4ca5d2c5867b36a6e203fbf55f741a644ba87c0 Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Wed, 8 May 2013 12:09:45 +1000
Subject: [PATCH] Cache Translation Storage
This patch reduces the memory footprint of each EntityPlayer by about 300 KB. The original class looks very unfinished and future versions might use the commented code.
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
index d88f864..2a52fe3 100644
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -1,5 +1,10 @@
package net.minecraft.server;
+// Spigot start
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+// Spigot end
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -12,15 +17,23 @@ import java.util.TreeMap;
public class LocaleLanguage {
+ // Spigot - cache languages to prevent reloading on each player creation
+ private static Cache<String,Properties> languages = CacheBuilder.newBuilder().weakValues().build(
+ new CacheLoader<String, Properties>() {
+ public Properties load(String key) {
+ return loadLanguage(key);
+ }
+ });
private static LocaleLanguage a = new LocaleLanguage("en_US");
- private Properties b = new Properties();
- private TreeMap c;
- private TreeMap d = new TreeMap();
+ private volatile Properties b = new Properties(); // Spigot - volatile
+ private static TreeMap c; // Spigot - static
+ // private TreeMap d = new TreeMap(); // Spigot - Unused map
private String e;
- private boolean f;
+ // private boolean f; // Spigot - removed
+ static { e(); } // Spigot - initializer
public LocaleLanguage(String s) {
- this.e();
+ // this.e(); // Spigot: moved up
this.a(s, false);
}
@@ -28,7 +41,7 @@ public class LocaleLanguage {
return a;
}
- private void e() {
+ private static void e() { // Spigot - static
TreeMap treemap = new TreeMap();
try {
@@ -46,23 +59,25 @@ public class LocaleLanguage {
return;
}
- this.c = treemap;
- this.c.put("en_US", "English (US)");
+ c = treemap; // Spigot - this => static
+ c.put("en_US", "English (US)"); // Spigot - this => static
}
public TreeMap b() {
return this.c;
}
- private void a(Properties properties, String s) throws IOException {
+ private static void a(Properties properties, String s) throws IOException { // Spigot - static
BufferedReader bufferedreader = null;
+ /* Spigot - unused map
if (this.d.containsKey(s)) {
bufferedreader = new BufferedReader(new FileReader((File) this.d.get(s)));
} else {
+ */
bufferedreader = new BufferedReader(new InputStreamReader(LocaleLanguage.class.getResourceAsStream("/lang/" + s + ".lang"), "UTF-8"));
- }
-
+ //} // Spigot: unused map
+ try { // Spigot: close reader
for (String s1 = bufferedreader.readLine(); s1 != null; s1 = bufferedreader.readLine()) {
s1 = s1.trim();
if (!s1.startsWith("#")) {
@@ -73,22 +88,32 @@ public class LocaleLanguage {
}
}
}
+ } finally { bufferedreader.close(); } // Spigot - close reader
}
public synchronized void a(String s, boolean flag) {
if (flag || !s.equals(this.e)) {
+ // Spigot start - Move loading code to new static method
+ this.e = s;
+ this.b = languages.getUnchecked(s);
+ }
+ }
+
+ private static Properties loadLanguage(String s) {
+ // Spigot end
Properties properties = new Properties();
try {
- this.a(properties, "en_US");
+ a(properties, "en_US"); // Spigot - this => static
} catch (IOException ioexception) {
;
}
- this.f = false;
+ // this.f = false; // Spigot - removed variable
if (!"en_US".equals(s)) {
try {
- this.a(properties, s);
+ a(properties, s); // Spigot - this => static
+ /* Spigot - f is unused, so unneeded code
Enumeration enumeration = properties.propertyNames();
while (enumeration.hasMoreElements() && !this.f) {
@@ -106,22 +131,25 @@ public class LocaleLanguage {
}
}
}
+ */
} catch (IOException ioexception1) {
ioexception1.printStackTrace();
- return;
+ //return; // Spigot - moved down
}
}
-
+ return properties; // Spigot - return properties
+ /* Spigot - moved up
this.e = s;
this.b = properties;
}
+ */
}
- public synchronized String a(String s) {
+ public String a(String s) { // Spigot - removed synchronized, b is volatile
return this.b.getProperty(s, s);
}
- public synchronized String a(String s, Object... aobject) {
+ public String a(String s, Object... aobject) { // Spigot - removed synchronized, b is volatile
String s1 = this.b.getProperty(s, s);
try {
@@ -131,11 +159,11 @@ public class LocaleLanguage {
}
}
- public synchronized boolean b(String s) {
+ public boolean b(String s) { // Spigot - removed synchronized, b is volatile
return this.b.containsKey(s);
}
- public synchronized String c(String s) {
+ public String c(String s) { // Spigot - removed synchronized, b is volatile
return this.b.getProperty(s + ".name", "");
}
}
--
1.8.1.2

4
CraftBukkit-Patches/0037-Improve-NextTickList-Performance.patch → CraftBukkit-Patches/0036-Improve-NextTickList-Performance.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ee7f3f6e22ddeacbad8b9ec13b96870fe585dbe2 Mon Sep 17 00:00:00 2001
From adecb1dcbedd1caa33611611c61bab1f6e524ed6 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 24 Apr 2013 01:43:33 -0500
Subject: [PATCH] Improve NextTickList Performance
@ -7,7 +7,7 @@ Improve next-tick-list performance on chunk unloads, large
queues
diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
index 52a70a1..08a4240 100644
index acf8838..1e3e0f8 100644
--- a/src/main/java/net/minecraft/server/NextTickListEntry.java
+++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
@@ -30,7 +30,7 @@ public class NextTickListEntry implements Comparable {

2
CraftBukkit-Patches/0038-Remove-o-Option.patch → CraftBukkit-Patches/0037-Remove-o-Option.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ae0e44f5154f07327ce85320d291f6d38d2b96b7 Mon Sep 17 00:00:00 2001
From baf5e49da1b4d18817431a4e39ccc6620a94d7e3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 19 May 2013 18:29:48 +1000
Subject: [PATCH] Remove -o Option

2
CraftBukkit-Patches/0039-Recipe-Deconstruction.patch → CraftBukkit-Patches/0038-Recipe-Deconstruction.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ee9df7fc1702b48e1080b8ebeb07ce65a910e214 Mon Sep 17 00:00:00 2001
From 03eaf655a90a9b4a6bbbf1fed236d66e04a35f4b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 1 Jun 2013 16:34:38 +1000
Subject: [PATCH] Recipe Deconstruction

2
CraftBukkit-Patches/0040-Fix-Health-Scaling.patch → CraftBukkit-Patches/0039-Fix-Health-Scaling.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 0a26bbedcd04bb3f6da1e48107710865af35feed Mon Sep 17 00:00:00 2001
From 489d10b8d87fcbcf917c6ed610b970c053021e7f Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 14:54:11 +1000
Subject: [PATCH] Fix Health Scaling

2
CraftBukkit-Patches/0041-Fix-EntityShootBowEvent-with-Skeletons.patch → CraftBukkit-Patches/0040-Fix-EntityShootBowEvent-with-Skeletons.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9de57bd9b69a1c413d231f763ad5d2eeee1ee37f Mon Sep 17 00:00:00 2001
From aa06528a0feb86107bbccf93382dc00434d6171e Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 15:04:37 +1000
Subject: [PATCH] Fix EntityShootBowEvent with Skeletons

2
CraftBukkit-Patches/0042-Implement-Arrow-API.patch → CraftBukkit-Patches/0041-Implement-Arrow-API.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9bcb4c341ee6908fa4a141583283d21283f26a55 Mon Sep 17 00:00:00 2001
From 95b3141e6a9c6dbf483a22ae8a0bfb5229ebba15 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API

10
CraftBukkit-Patches/0043-Particle-API.patch → CraftBukkit-Patches/0042-Particle-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From e35ea6d5ff7784e40efa156226e52ffae59afe4a Mon Sep 17 00:00:00 2001
From 8aba10490a88039920072d9fec1e77823d33d54e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 16:14:30 +1000
Subject: [PATCH] Particle API
diff --git a/src/main/java/net/minecraft/server/Packet63WorldParticles.java b/src/main/java/net/minecraft/server/Packet63WorldParticles.java
index 3ef5af3..f593279 100644
index d7f4d2a..5e051eb 100644
--- a/src/main/java/net/minecraft/server/Packet63WorldParticles.java
+++ b/src/main/java/net/minecraft/server/Packet63WorldParticles.java
@@ -17,6 +17,20 @@ public class Packet63WorldParticles extends Packet {
@ -26,9 +26,9 @@ index 3ef5af3..f593279 100644
+ }
+ // Spigot end
+
public void a(DataInputStream datainputstream) throws java.io.IOException {
this.a = a(datainputstream, 64);
this.b = datainputstream.readFloat();
public void a(DataInput datainput) {
this.a = a(datainput, 64);
this.b = datainput.readFloat();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
index 7de0de5..7eca388 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java

2
CraftBukkit-Patches/0044-Hopper-Cooldowns.patch → CraftBukkit-Patches/0043-Hopper-Cooldowns.patch
Datei anzeigen

@ -1,4 +1,4 @@
From db80377236dd2416e98541e7c4b5c0bdf6de28b5 Mon Sep 17 00:00:00 2001
From 0ca5879afd622fbc6b38b413d616f0f9eca23262 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns

2
CraftBukkit-Patches/0045-Prevent-Shutdown-Hang.patch → CraftBukkit-Patches/0044-Prevent-Shutdown-Hang.patch
Datei anzeigen

@ -1,4 +1,4 @@
From dd5a9e11c5991ac7ffc5f7fec36058d353ca9418 Mon Sep 17 00:00:00 2001
From a1299646d0fbd254c351de460106801c70904ce8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang

2
CraftBukkit-Patches/0046-Implement-SpawnerSpawnEvent.patch → CraftBukkit-Patches/0045-Implement-SpawnerSpawnEvent.patch
Datei anzeigen

@ -1,4 +1,4 @@
From d16b6fed78847a022e2898b61512adc00a86f6ac Mon Sep 17 00:00:00 2001
From f8150459f44708061297099f8c5eb53b3e8b511b Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent.

2
CraftBukkit-Patches/0047-Firework-Meta-Crash-Fix.patch → CraftBukkit-Patches/0046-Firework-Meta-Crash-Fix.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 395165e77c0d165c30ffbba7eea45b98d81f4b93 Mon Sep 17 00:00:00 2001
From b95752171e934df29256399fcdef822b44ba3a02 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 15 Jun 2013 21:34:48 +1000
Subject: [PATCH] Firework Meta Crash Fix

4
CraftBukkit-Patches/0048-Do-Not-Search-for-Offline-Players.patch → CraftBukkit-Patches/0047-Do-Not-Search-for-Offline-Players.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 4822e71bfb0e5730738fd2a06a4bf3ff33e75c28 Mon Sep 17 00:00:00 2001
From 885ded5d2cb6525352c4ca9f57e436f145d954fe Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players
@ -6,7 +6,7 @@ Subject: [PATCH] Do Not Search for Offline Players
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2cca80a..1fcbd33 100644
index b49519a..bcbf8d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1088,7 +1088,7 @@ public final class CraftServer implements Server {

2
CraftBukkit-Patches/0049-Enable-Foreign-Language-Signs.patch → CraftBukkit-Patches/0048-Enable-Foreign-Language-Signs.patch
Datei anzeigen

@ -1,4 +1,4 @@
From ae268b91679cfb9c2fc4d94e095cd01ba4d6bcba Mon Sep 17 00:00:00 2001
From 5ad52598e1bad0229c825571bdfe9842a43fcec3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:53:03 +1000
Subject: [PATCH] Enable Foreign Language Signs

2
CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch → CraftBukkit-Patches/0049-Spam-Filter-Exclusions.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 6c60d0e5cb8690f7a022ff2bc24731a7e4a43891 Mon Sep 17 00:00:00 2001
From 6320f09c6f5660b8e94e9198f6472e3201caff1b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:59:22 +1000
Subject: [PATCH] Spam Filter Exclusions

2
CraftBukkit-Patches/0051-Allow-Disabling-of-Command-Logging.patch → CraftBukkit-Patches/0050-Allow-Disabling-of-Command-Logging.patch
Datei anzeigen

@ -1,4 +1,4 @@
From b2fb1342018352db6b72d88ed4891ef0f4fd5808 Mon Sep 17 00:00:00 2001
From 024b39bcb8cdd0f933238f1ea8977cdf2e4525c8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging

2
CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch → CraftBukkit-Patches/0051-Allow-Disabling-of-Command-TabComplete.patch
Datei anzeigen

@ -1,4 +1,4 @@
From d6a9328ef91467aca75b674c256101b3c34aa859 Mon Sep 17 00:00:00 2001
From 6805d7fa28b46ef2f73b8fc6865fef3b0c585190 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete

4
CraftBukkit-Patches/0053-Configurable-Messages.patch → CraftBukkit-Patches/0052-Configurable-Messages.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 14d25e3f6a553e02f594aaf9ee9be63816fc7373 Mon Sep 17 00:00:00 2001
From 44dfe443a48c8054e80c333398df3b04ed273fdf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index fe846af..ab38736 100644
index 1276ec4..cbe823f 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -307,7 +307,7 @@ public abstract class PlayerList {

2
CraftBukkit-Patches/0054-Allow-Disabling-of-Random-Lighting-Updates.patch → CraftBukkit-Patches/0053-Allow-Disabling-of-Random-Lighting-Updates.patch
Datei anzeigen

@ -1,4 +1,4 @@
From e73fc332b824f38374b26960ec134c67a271a6f4 Mon Sep 17 00:00:00 2001
From fc55fff3d14e51d373340c8837fc359016da88c4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates

2
CraftBukkit-Patches/0055-Add-Log-Filtering.patch → CraftBukkit-Patches/0054-Add-Log-Filtering.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 8827c2719087cd4791798e31ac7bd4de2837be4e Mon Sep 17 00:00:00 2001
From 589fadd545d27dd30ad90f8c5245fb8f2bbe96d2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:40:11 +1000
Subject: [PATCH] Add Log Filtering

2
CraftBukkit-Patches/0056-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch → CraftBukkit-Patches/0055-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 3f226c99b2d86e18422501ceb34ce61677627c14 Mon Sep 17 00:00:00 2001
From c7d17ce7d1b4f79a6a83984aa4bc84a816341046 Mon Sep 17 00:00:00 2001
From: Andre LeBlanc <andre@norcode.com>
Date: Sat, 6 Apr 2013 12:00:31 -0400
Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes

2
CraftBukkit-Patches/0057-Always-Fire-PreLoginEvent.patch → CraftBukkit-Patches/0056-Always-Fire-PreLoginEvent.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 22b6fb72ab5ba663f138f46bab8fba97ee194286 Mon Sep 17 00:00:00 2001
From 05798603458ae028f4d6fad97abf0ba28f7b7046 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 25 Jun 2013 18:09:26 +1000
Subject: [PATCH] Always Fire PreLoginEvent

2
CraftBukkit-Patches/0058-Properly-Close-Inventories.patch → CraftBukkit-Patches/0057-Properly-Close-Inventories.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 2868feb3889d95d778dcaec82889cd0cad10f0a5 Mon Sep 17 00:00:00 2001
From 81a3d7e98800ae5a87ee7cbc292c818747cff50a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories

2
CraftBukkit-Patches/0059-Disallow-Interaction-With-Self.patch → CraftBukkit-Patches/0058-Disallow-Interaction-With-Self.patch
Datei anzeigen

@ -1,4 +1,4 @@
From a8399a4077723881c4dc54d714ef746f706b6c7d Mon Sep 17 00:00:00 2001
From 80ea308e8890b1f7f612f20dd7b1b53a2d52b316 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self

4
CraftBukkit-Patches/0060-Lower-Chunk-Compression.patch → CraftBukkit-Patches/0059-Lower-Chunk-Compression.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 53ffa727524cc9b11a6f72c173154c445cca3823 Mon Sep 17 00:00:00 2001
From 23ce10c42d96b9bf6416f8a65dd208f39fc5d42d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:07:54 +1000
Subject: [PATCH] Lower Chunk Compression
@ -19,7 +19,7 @@ index efe102e..c29b81e 100644
this.d = chunkmap.c;
this.c = chunkmap.b;
diff --git a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
index a2cd9b0..ccbb07e 100644
index a6e3be2..63dd8d3 100644
--- a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
+++ b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
@@ -24,7 +24,7 @@ public class Packet56MapChunkBulk extends Packet {