From f775c4dbd1276fb589a0de4a1d98441dba1beb01 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 24 Oct 2013 21:23:24 +1100 Subject: [PATCH] Upstream Merge --- Bukkit | 2 +- Bukkit-Patches/0001-POM-Changes.patch | 8 ++--- Bukkit-Patches/0011-Update-Depends.patch | 10 +++---- CraftBukkit | 2 +- CraftBukkit-Patches/0001-POM-Changes.patch | 30 ++++++++++--------- .../0003-Skeleton-API-Implementations.patch | 8 ++--- .../0004-Spigot-Configuration.patch | 12 ++++---- .../0017-Improved-Timings-System.patch | 14 ++++----- CraftBukkit-Patches/0023-Netty.patch | 8 ++--- .../0033-Close-Unloaded-Save-Files.patch | 8 ++--- ...034-Improve-NextTickList-Performance.patch | 8 ++--- CraftBukkit-Patches/0038-Particle-API.patch | 10 +++---- ...43-Do-Not-Search-for-Offline-Players.patch | 8 ++--- .../0044-Enable-Foreign-Language-Signs.patch | 8 ++--- .../0045-Spam-Filter-Exclusions.patch | 10 +++---- ...6-Allow-Disabling-of-Command-Logging.patch | 8 ++--- ...low-Disabling-of-Command-TabComplete.patch | 8 ++--- .../0048-Configurable-Messages.patch | 8 ++--- .../0054-Disallow-Interaction-With-Self.patch | 8 ++--- 19 files changed, 90 insertions(+), 88 deletions(-) diff --git a/Bukkit b/Bukkit index 13add0250e..92d0125e7f 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 13add0250e0d262c48206a5c2bc4c2fcb30c9f21 +Subproject commit 92d0125e7f716d83b9165178e4e7eff8a7b426db diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 615be41de8..fd2d9321fa 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 592fb8e4709be193461d8dc93920bf3fc072f1af Mon Sep 17 00:00:00 2001 +From 0147bd846abb4e7d73f400232fcda179a552a78e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index dfdcbdf..2d1df20 100644 +index d1d18db..3dae8d4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,43 +1,23 @@ @@ -23,7 +23,7 @@ index dfdcbdf..2d1df20 100644 + + org.spigotmc + spigot-api - 1.6.4-R0.1-SNAPSHOT + 1.6.4-R1.1-SNAPSHOT - Bukkit - http://www.bukkit.org + Spigot-API @@ -65,5 +65,5 @@ index dfdcbdf..2d1df20 100644 -- -1.8.1.2 +1.8.3.2 diff --git a/Bukkit-Patches/0011-Update-Depends.patch b/Bukkit-Patches/0011-Update-Depends.patch index 1101b09647..3f66a24271 100644 --- a/Bukkit-Patches/0011-Update-Depends.patch +++ b/Bukkit-Patches/0011-Update-Depends.patch @@ -1,4 +1,4 @@ -From 69feff718e80cd27a3bcc2f44f11e3f95c271631 Mon Sep 17 00:00:00 2001 +From 512a9d53929c21762f9a94683a8fb944288f6197 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 4 Jul 2013 20:05:19 +1000 Subject: [PATCH] Update Depends @@ -6,10 +6,10 @@ Subject: [PATCH] Update Depends - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries. diff --git a/pom.xml b/pom.xml -index 2b1abbb..14833af 100644 +index 3dae8d4..a5b048e 100644 --- a/pom.xml +++ b/pom.xml -@@ -78,21 +78,21 @@ +@@ -77,21 +77,21 @@ org.yaml snakeyaml @@ -34,7 +34,7 @@ index 2b1abbb..14833af 100644 jar compile -@@ -106,7 +106,7 @@ +@@ -105,7 +105,7 @@ commons-lang commons-lang @@ -44,5 +44,5 @@ index 2b1abbb..14833af 100644 -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit b/CraftBukkit index 9532cb6ba0..e63ace2f25 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 9532cb6ba0d6be1d50839910cabd38fc7d2a8eb1 +Subproject commit e63ace2f25daa48c859b2585ebe0d479b316fa10 diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index f07b15eec4..c815029914 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 0acc49565a770628bc80bc7c615d82f2d2c8ccd0 Mon Sep 17 00:00:00 2001 +From d126a83bee19a7cad37ba569b9df9e4dc55f5f71 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 7c23af9..c155913 100644 +index 56b9e37..e165937 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,20 @@ @@ -25,7 +25,7 @@ index 7c23af9..c155913 100644 + org.spigotmc + spigot jar - 1.6.4-R0.1-SNAPSHOT + 1.6.4-R1.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot @@ -33,8 +33,8 @@ index 7c23af9..c155913 100644 UTF-8 -@@ -16,25 +24,6 @@ - 1_6_R3 +@@ -18,25 +26,6 @@ + - @@ -59,7 +59,7 @@ index 7c23af9..c155913 100644 repobo-snap -@@ -51,8 +40,8 @@ +@@ -53,8 +42,8 @@ @@ -70,7 +70,7 @@ index 7c23af9..c155913 100644 ${project.version} jar compile -@@ -105,33 +94,6 @@ +@@ -107,33 +96,6 @@ gson 2.1 @@ -104,7 +104,7 @@ index 7c23af9..c155913 100644 junit -@@ -145,18 +107,23 @@ +@@ -147,19 +109,24 @@ 1.3 test @@ -125,12 +125,14 @@ index 7c23af9..c155913 100644 gitdescribe-maven-plugin 1.3 -- git-Bukkit- +- ${buildtag.prefix} +- ${buildtag.suffix} + git-Spigot- - ++ -@@ -210,7 +177,7 @@ + +@@ -212,7 +179,7 @@ org.apache.maven.plugins maven-shade-plugin @@ -140,10 +142,10 @@ index 7c23af9..c155913 100644 package diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index df2efe2..d9396f1 100644 +index 85be77e..cee0549 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -208,7 +208,7 @@ public final class CraftServer implements Server { +@@ -210,7 +210,7 @@ public final class CraftServer implements Server { chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold"); updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel")); @@ -166,5 +168,5 @@ index f905d17..9304637 100644 if (stream != null) { -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 66b7961479..c1157d6378 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,14 +1,14 @@ -From 671c8e6f49c82a03125fb9983a3d1df081f6ccd7 Mon Sep 17 00:00:00 2001 +From e0fec2ec7e896f2c660729f24eb0b72791865915 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e8315dd..fc71833 100644 +index 9f75d8e..856c713 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1267,4 +1267,14 @@ public class CraftWorld implements World { +@@ -1268,4 +1268,14 @@ public class CraftWorld implements World { cps.queueUnload(chunk.x, chunk.z); } } @@ -84,5 +84,5 @@ index ac73273..63ce45a 100644 + // Spigot end } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch index 2a31be8ad4..926d66ef44 100644 --- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 8f375266d3bae960a7dca5ca52ac9d40d044239f Mon Sep 17 00:00:00 2001 +From f964622c2736fc8d723025d8553ca2ce91b7d67e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -54,10 +54,10 @@ index 3924a5c..fbbfa33 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d9396f1..acd5b42 100644 +index cee0549..62ecc19 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -214,8 +214,10 @@ public final class CraftServer implements Server { +@@ -216,8 +216,10 @@ public final class CraftServer implements Server { updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update")); updater.check(serverVersion); @@ -70,7 +70,7 @@ index d9396f1..acd5b42 100644 } private File getConfigFile() { -@@ -560,6 +562,7 @@ public final class CraftServer implements Server { +@@ -566,6 +568,7 @@ public final class CraftServer implements Server { playerList.getIPBans().load(); playerList.getNameBans().load(); @@ -78,7 +78,7 @@ index d9396f1..acd5b42 100644 for (WorldServer world : console.worlds) { world.difficulty = difficulty; world.setSpawnFlags(monsters, animals); -@@ -574,11 +577,13 @@ public final class CraftServer implements Server { +@@ -580,11 +583,13 @@ public final class CraftServer implements Server { } else { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } @@ -296,5 +296,5 @@ index 0000000..961ddb4 + } +} -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0017-Improved-Timings-System.patch b/CraftBukkit-Patches/0017-Improved-Timings-System.patch index 28cd1c7574..258f6e0403 100644 --- a/CraftBukkit-Patches/0017-Improved-Timings-System.patch +++ b/CraftBukkit-Patches/0017-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From 85337aff36373256de0d97501f509d6d83642d83 Mon Sep 17 00:00:00 2001 +From 8eccd95e302141a9334eac45ed42f09658e99ac3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Improved Timings System @@ -63,7 +63,7 @@ index 2158088..d65c123 100644 protected void D() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 830abcd..fba219f 100644 +index d3a4265..dec46bd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -7,7 +7,6 @@ import java.security.KeyPair; @@ -144,10 +144,10 @@ index 830abcd..fba219f 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a5d7500..ad65a6a 100644 +index e4cb5c7..8443731 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -944,6 +944,7 @@ public class PlayerConnection extends Connection { +@@ -953,6 +953,7 @@ public class PlayerConnection extends Connection { // CraftBukkit end private void handleCommand(String s) { @@ -155,7 +155,7 @@ index a5d7500..ad65a6a 100644 // CraftBukkit start CraftPlayer player = this.getPlayer(); -@@ -951,19 +952,23 @@ public class PlayerConnection extends Connection { +@@ -960,19 +961,23 @@ public class PlayerConnection extends Connection { this.server.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -299,7 +299,7 @@ index ebbda63..3143d6e 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bff9c6a..c1239f1 100644 +index 88a9f88..3afcc0e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -179,9 +179,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate @@ -543,5 +543,5 @@ index 55db3ff..7d294c0 100644 } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0023-Netty.patch b/CraftBukkit-Patches/0023-Netty.patch index 701b9b9874..29809f8d1f 100644 --- a/CraftBukkit-Patches/0023-Netty.patch +++ b/CraftBukkit-Patches/0023-Netty.patch @@ -1,14 +1,14 @@ -From d7703ce7f9edfb6f80761546feb3658809bd75e8 Mon Sep 17 00:00:00 2001 +From 37c05ef56a5463e718e6ce1dcc01b35949af4ddb Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 09:06:29 +1000 Subject: [PATCH] Netty diff --git a/pom.xml b/pom.xml -index c155913..3ca28d6 100644 +index e165937..cc5d9da 100644 --- a/pom.xml +++ b/pom.xml -@@ -112,6 +112,21 @@ +@@ -114,6 +114,21 @@ trove4j 3.0.3 @@ -1488,5 +1488,5 @@ index 0000000..d3a9cab + DATA; +} -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0033-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0033-Close-Unloaded-Save-Files.patch index b136a61197..54b839bebb 100644 --- a/CraftBukkit-Patches/0033-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0033-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From 6bb9f5d2f82fe045480d9ba164325e2205e28344 Mon Sep 17 00:00:00 2001 +From 22a302760e6ebdc25898e5ef540b2f0a6c8c05a4 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files @@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644 public static synchronized RegionFile a(File file1, int i, int j) { File file2 = new File(file1, "region"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index acd5b42..84ff542 100644 +index 62ecc19..06a4ef6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -37,6 +37,8 @@ import net.minecraft.server.MinecraftServer; @@ -30,7 +30,7 @@ index acd5b42..84ff542 100644 import net.minecraft.server.ServerNBTManager; import net.minecraft.server.WorldLoaderServer; import net.minecraft.server.WorldManager; -@@ -817,6 +819,30 @@ public final class CraftServer implements Server { +@@ -823,6 +825,30 @@ public final class CraftServer implements Server { worlds.remove(world.getName().toLowerCase()); console.worlds.remove(console.worlds.indexOf(handle)); @@ -62,5 +62,5 @@ index acd5b42..84ff542 100644 } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch b/CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch index 0bf1b37453..a6e581fcbe 100644 --- a/CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch +++ b/CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch @@ -1,4 +1,4 @@ -From 271f0e350784d53e752a939d5fba64d6e90d3402 Mon Sep 17 00:00:00 2001 +From 131db6fa5dabe5cc1563b6b57fb98a4d44b63030 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 24 Apr 2013 01:43:33 -0500 Subject: [PATCH] Improve NextTickList Performance @@ -20,7 +20,7 @@ index acf8838..1e3e0f8 100644 public NextTickListEntry a(long i) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c1239f1..588c630 100644 +index 3afcc0e..5eb335f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -25,8 +25,8 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate @@ -245,7 +245,7 @@ index c1239f1..588c630 100644 this.b(worldsettings); super.a(worldsettings); -@@ -991,4 +969,62 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -995,4 +973,62 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate return this.setTypeIdAndData(x, y, z, typeId, data, 3); } // CraftBukkit end @@ -309,5 +309,5 @@ index c1239f1..588c630 100644 + // Spigot end } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0038-Particle-API.patch b/CraftBukkit-Patches/0038-Particle-API.patch index 68807bd97a..35b437387f 100644 --- a/CraftBukkit-Patches/0038-Particle-API.patch +++ b/CraftBukkit-Patches/0038-Particle-API.patch @@ -1,4 +1,4 @@ -From 044ddcbc15cf82f9b460c57e0efb56cb02071b7d Mon Sep 17 00:00:00 2001 +From 298046b76051b6baf697fa083a28c6c41ce67472 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API @@ -43,10 +43,10 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7601fb5..0faf5bf 100644 +index 15e28cb..4076e6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -765,31 +765,21 @@ public class CraftWorld implements World { +@@ -766,31 +766,21 @@ public class CraftWorld implements World { } else { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -88,7 +88,7 @@ index 7601fb5..0faf5bf 100644 public T spawn(Location location, Class clazz) throws IllegalArgumentException { return spawn(location, clazz, SpawnReason.CUSTOM); } -@@ -1273,6 +1263,62 @@ public class CraftWorld implements World { +@@ -1274,6 +1264,62 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { @@ -236,5 +236,5 @@ index e242f7d..4bae056 100644 public Player.Spigot spigot() -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0043-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0043-Do-Not-Search-for-Offline-Players.patch index 17aeab8a8b..26460c0978 100644 --- a/CraftBukkit-Patches/0043-Do-Not-Search-for-Offline-Players.patch +++ b/CraftBukkit-Patches/0043-Do-Not-Search-for-Offline-Players.patch @@ -1,4 +1,4 @@ -From e7b329f9c5dc0009be2358d1548b8018997dbd87 Mon Sep 17 00:00:00 2001 +From 478d31c33b0dd712754a68077ebe0bffa294c882 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 16 Jun 2013 08:20:26 +1000 Subject: [PATCH] Do Not Search for Offline Players @@ -6,10 +6,10 @@ 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 84ff542..c127f2a 100644 +index 06a4ef6..a1fdc79 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1098,7 +1098,7 @@ public final class CraftServer implements Server { +@@ -1105,7 +1105,7 @@ public final class CraftServer implements Server { } public OfflinePlayer getOfflinePlayer(String name) { @@ -19,5 +19,5 @@ index 84ff542..c127f2a 100644 public OfflinePlayer getOfflinePlayer(String name, boolean search) { -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0044-Enable-Foreign-Language-Signs.patch b/CraftBukkit-Patches/0044-Enable-Foreign-Language-Signs.patch index 607290a8eb..4601d2c27f 100644 --- a/CraftBukkit-Patches/0044-Enable-Foreign-Language-Signs.patch +++ b/CraftBukkit-Patches/0044-Enable-Foreign-Language-Signs.patch @@ -1,14 +1,14 @@ -From 76a5762754c4dcce4f4c84e15ebb5d706a4f055a Mon Sep 17 00:00:00 2001 +From 4eae57efe800fe1a98a83fb2b22352e6c2c79bf0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:53:03 +1000 Subject: [PATCH] Enable Foreign Language Signs diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ad65a6a..3437f98 100644 +index 8443731..a836111 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1577,7 +1577,7 @@ public class PlayerConnection extends Connection { +@@ -1586,7 +1586,7 @@ public class PlayerConnection extends Connection { flag = false; } else { for (i = 0; i < packet130updatesign.lines[j].length(); ++i) { @@ -18,5 +18,5 @@ index ad65a6a..3437f98 100644 } } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0045-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0045-Spam-Filter-Exclusions.patch index a09c49e1ce..e83998b8fb 100644 --- a/CraftBukkit-Patches/0045-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0045-Spam-Filter-Exclusions.patch @@ -1,15 +1,15 @@ -From 67f688671ac381a57dc702ea91878bf6f56473f1 Mon Sep 17 00:00:00 2001 +From 86d91741f9b8c49805e5473a6ded05dae11c11da Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:59:22 +1000 Subject: [PATCH] Spam Filter Exclusions diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3437f98..fd6995d 100644 +index a836111..759dc89 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -834,7 +834,17 @@ public class PlayerConnection extends Connection { - this.chat(s, packet3chat.a_()); +@@ -843,7 +843,17 @@ public class PlayerConnection extends Connection { + } // This section stays because it is only applicable to packets - if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.getName())) { // CraftBukkit use thread-safe spam @@ -46,5 +46,5 @@ index 92cfac6..86e3680 100644 + } } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch index 5b0deb0ee9..9343de0319 100644 --- a/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch @@ -1,14 +1,14 @@ -From 912bce0a32246db9bbe1624ed6f69d9188d9fd4e Mon Sep 17 00:00:00 2001 +From c94b0568262d0bf5f9fb4817903fb1e908d370e0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:01:29 +1000 Subject: [PATCH] Allow Disabling of Command Logging diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index fd6995d..3c03d5a 100644 +index 759dc89..c867fcf 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -967,7 +967,12 @@ public class PlayerConnection extends Connection { +@@ -976,7 +976,12 @@ public class PlayerConnection extends Connection { } try { @@ -38,5 +38,5 @@ index 86e3680..babedc0 100644 + } } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch index e3160aaa53..78c89f1098 100644 --- a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch @@ -1,14 +1,14 @@ -From 249bf6de8ad4cb9037433ba6a12028857243a994 Mon Sep 17 00:00:00 2001 +From 7bf7fbec6b559c4418506b2694c2bcb1102105f2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c127f2a..0fa69ea 100644 +index a1fdc79..0d7b044 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1365,7 +1365,7 @@ public final class CraftServer implements Server { +@@ -1372,7 +1372,7 @@ public final class CraftServer implements Server { public List tabCompleteCommand(Player player, String message) { List completions = null; try { @@ -33,5 +33,5 @@ index babedc0..e146926 100644 + } } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0048-Configurable-Messages.patch b/CraftBukkit-Patches/0048-Configurable-Messages.patch index da95f7bdf5..1813cec88b 100644 --- a/CraftBukkit-Patches/0048-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0048-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From 5a1596d67176919fc09426d001bbf75e50ce8269 Mon Sep 17 00:00:00 2001 +From 970b4ae4d7f0ed9c3114609d2c6a56b1dd041071 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages @@ -43,10 +43,10 @@ index a85157b..e5a259d 100644 event.disallow(PlayerLoginEvent.Result.ALLOWED, s2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0fa69ea..404a626 100644 +index 0d7b044..20719f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -528,11 +528,7 @@ public final class CraftServer implements Server { +@@ -533,11 +533,7 @@ public final class CraftServer implements Server { return true; } @@ -95,5 +95,5 @@ index e146926..1d9d3c9 100644 + } } -- -1.8.1.2 +1.8.3.2 diff --git a/CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch index 77aa824c19..852e983fd9 100644 --- a/CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch @@ -1,14 +1,14 @@ -From dc55945b5c2fd28d17722ca421f6537adb422d8f Mon Sep 17 00:00:00 2001 +From 0bc311b8717924ada1e4fa43cc81d3caa7563ae8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 28 Jun 2013 19:52:54 +1000 Subject: [PATCH] Disallow Interaction With Self diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3c03d5a..10d853b 100644 +index c867fcf..6c8aa41 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1087,6 +1087,13 @@ public class PlayerConnection extends Connection { +@@ -1096,6 +1096,13 @@ public class PlayerConnection extends Connection { WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); Entity entity = worldserver.getEntity(packet7useentity.target); @@ -23,5 +23,5 @@ index 3c03d5a..10d853b 100644 this.player.u(); if (entity != null) { -- -1.8.1.2 +1.8.3.2