From c2dd4596501da82cd880005bf824b569c9549952 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 14:38:17 +1000 Subject: [PATCH] Nearly done, testing time. --- ...Fire-PreLogin-Events-in-Offline-Mode.patch | 10 +- .../0067-BungeeCord-Support.patch | 33 +-- ...-support-for-fetching-hidden-players.patch | 14 +- ...iptive-kick-reasons-instead-of-Nope.patch} | 2 +- .../0115-Optimize-Player-Lookup.patch | 188 ------------------ ...chanting-tables-to-enchant-any-item.patch} | 2 +- ...lastChunkAccessed-if-it-is-unloaded.patch} | 2 +- ...y-prefixed-commands-or-commands-tha.patch} | 2 +- ...names-to-prevent-client-disconnects.patch} | 2 +- ...> 0120-Enable-Improved-Ping-Sending.patch} | 8 +- ...etOfflinePlayer-UUID-on-main-thread.patch} | 6 +- ...ragon-death-and-wither-spawn-sounds.patch} | 2 +- ...getting-ticked-after-being-queued-f.patch} | 2 +- ...-client-crashes-server-lists-and-Mo.patch} | 2 +- 14 files changed, 50 insertions(+), 225 deletions(-) rename CraftBukkit-Patches/{0116-Descriptive-kick-reasons-instead-of-Nope.patch => 0115-Descriptive-kick-reasons-instead-of-Nope.patch} (97%) delete mode 100644 CraftBukkit-Patches/0115-Optimize-Player-Lookup.patch rename CraftBukkit-Patches/{0117-Allow-enchanting-tables-to-enchant-any-item.patch => 0116-Allow-enchanting-tables-to-enchant-any-item.patch} (96%) rename CraftBukkit-Patches/{0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch => 0117-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch} (98%) rename CraftBukkit-Patches/{0119-Check-for-manually-prefixed-commands-or-commands-tha.patch => 0118-Check-for-manually-prefixed-commands-or-commands-tha.patch} (95%) rename CraftBukkit-Patches/{0120-Cap-window-names-to-prevent-client-disconnects.patch => 0119-Cap-window-names-to-prevent-client-disconnects.patch} (93%) rename CraftBukkit-Patches/{0121-Enable-Improved-Ping-Sending.patch => 0120-Enable-Improved-Ping-Sending.patch} (91%) rename CraftBukkit-Patches/{0122-Prevent-getOfflinePlayer-UUID-on-main-thread.patch => 0121-Prevent-getOfflinePlayer-UUID-on-main-thread.patch} (83%) rename CraftBukkit-Patches/{0123-Configurable-dragon-death-and-wither-spawn-sounds.patch => 0122-Configurable-dragon-death-and-wither-spawn-sounds.patch} (98%) rename CraftBukkit-Patches/{0124-Fix-TileEntities-getting-ticked-after-being-queued-f.patch => 0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch} (95%) rename CraftBukkit-Patches/{0125-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch => 0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch} (92%) diff --git a/CraftBukkit-Patches/0066-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0066-Fire-PreLogin-Events-in-Offline-Mode.patch index c198bef14b..c69691ab04 100644 --- a/CraftBukkit-Patches/0066-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0066-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,11 +1,11 @@ -From b3766c829b07913655f7238d91b865fe3884be2f Mon Sep 17 00:00:00 2001 +From e144ac992708501a0283d1462490e96d4f3c0b76 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:32:10 +1100 Subject: [PATCH] Fire PreLogin Events in Offline Mode diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 8f982f1..eb227bc 100644 +index 8f982f1..0755d36 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -59,10 +59,23 @@ public class LoginListener implements PacketLoginInListener { @@ -15,7 +15,7 @@ index 8f982f1..eb227bc 100644 + // Spigot start + public void initUUID() + { -+ String uuid = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + this.i.getName() ).getBytes( Charsets.UTF_8 ) ).toString().replaceAll( "-", "" ); ++ UUID uuid = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + this.i.getName() ).getBytes( Charsets.UTF_8 ) ); + + this.i = new GameProfile( uuid, this.i.getName() ); + } @@ -42,7 +42,7 @@ index 8f982f1..eb227bc 100644 } diff --git a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java -index 6b91be7..b41ed2f 100644 +index 6b91be7..1b2620c 100644 --- a/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java +++ b/src/main/java/net/minecraft/server/ThreadPlayerLookupUUID.java @@ -25,50 +25,19 @@ class ThreadPlayerLookupUUID extends Thread { @@ -50,7 +50,7 @@ index 6b91be7..b41ed2f 100644 try { + // Spigot Start -+ if ( !LoginListener.b( this.a ).getOnlineMode() ) ++ if ( !LoginListener.c( this.a ).getOnlineMode() ) + { + a.initUUID(); + fireLoginEvents(); diff --git a/CraftBukkit-Patches/0067-BungeeCord-Support.patch b/CraftBukkit-Patches/0067-BungeeCord-Support.patch index c70aff56a7..0fe10ed02b 100644 --- a/CraftBukkit-Patches/0067-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0067-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 7a40301085d45e555e5d980b663a03fc7215870e Mon Sep 17 00:00:00 2001 +From 356dff0aa787496546e42947c933cf0b3a316114 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -6,10 +6,18 @@ Subject: [PATCH] BungeeCord Support Provides support for IP forwarding via BungeeCord. diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index b98079c..0542db3 100644 +index b98079c..c738ab5 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java -@@ -73,6 +73,22 @@ public class HandshakeListener implements PacketHandshakingInListener { +@@ -5,6 +5,7 @@ import net.minecraft.util.io.netty.util.concurrent.GenericFutureListener; + // CraftBukkit start + import java.net.InetAddress; + import java.util.HashMap; ++import net.minecraft.util.com.mojang.util.UUIDTypeAdapter; + // CraftBukkit end + + public class HandshakeListener implements PacketHandshakingInListener { +@@ -73,6 +74,22 @@ public class HandshakeListener implements PacketHandshakingInListener { this.b.close(chatcomponenttext); } else { this.b.a((PacketListener) (new LoginListener(this.a, this.b))); @@ -19,7 +27,7 @@ index b98079c..0542db3 100644 + if ( split.length == 3 ) { + packethandshakinginsetprotocol.b = split[0]; + b.n = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) b.getSocketAddress()).getPort()); -+ b.spoofedUUID = split[2]; ++ b.spoofedUUID = UUIDTypeAdapter.fromString( split[2] ); + } else + { + chatcomponenttext = new ChatComponentText("If you wish to use IP forwarding, please enable it in your BungeeCord config as well!"); @@ -33,28 +41,27 @@ index b98079c..0542db3 100644 } break; diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index eb227bc..04d9f73 100644 +index 0755d36..990dbef 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java -@@ -62,8 +62,14 @@ public class LoginListener implements PacketLoginInListener { +@@ -62,7 +62,14 @@ public class LoginListener implements PacketLoginInListener { // Spigot start public void initUUID() { -- String uuid = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + this.i.getName() ).getBytes( Charsets.UTF_8 ) ).toString().replaceAll( "-", "" ); -- -+ String uuid; +- UUID uuid = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + this.i.getName() ).getBytes( Charsets.UTF_8 ) ); ++ UUID uuid; + if ( networkManager.spoofedUUID != null ) + { + uuid = networkManager.spoofedUUID; + } else + { -+ uuid = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + this.i.getName() ).getBytes( Charsets.UTF_8 ) ).toString().replaceAll("-", ""); ++ uuid = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + this.i.getName() ).getBytes( Charsets.UTF_8 ) ); + } + this.i = new GameProfile( uuid, this.i.getName() ); } - // Spigot end diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 1dd2227..c4a86bf 100644 +index 1dd2227..6789ca8 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -36,7 +36,8 @@ public class NetworkManager extends SimpleChannelInboundHandler { @@ -63,7 +70,7 @@ index 1dd2227..c4a86bf 100644 private Channel m; - private SocketAddress n; + public SocketAddress n; // Spigot -+ public String spoofedUUID; // Spigot ++ public java.util.UUID spoofedUUID; // Spigot private PacketListener o; private EnumProtocol p; private IChatBaseComponent q; diff --git a/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch index b0f1cbd383..0e703611a8 100644 --- a/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch @@ -1,14 +1,14 @@ -From 96f5ab167d2dc52dd71692bd9ed200fa7bd46569 Mon Sep 17 00:00:00 2001 +From dcac97e8a999b9ff4bda55a612a260cc9527ea4f Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6f008db..302305d 100644 +index 6f008db..779c996 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1374,6 +1374,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1374,6 +1374,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { return getHandle().locale; } @@ -16,7 +16,13 @@ index 6f008db..302305d 100644 + @Override + public Set getHiddenPlayers() + { -+ return java.util.Collections.unmodifiableSet( new HashSet( hiddenPlayers.values() ) ); ++ Set ret = new HashSet(); ++ for ( UUID u : hiddenPlayers ) ++ { ++ ret.add( getServer().getPlayer( u ) ); ++ } ++ ++ return java.util.Collections.unmodifiableSet( ret ); + } }; diff --git a/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0115-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 97% rename from CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0115-Descriptive-kick-reasons-instead-of-Nope.patch index b9c917ad7a..895ce78d21 100644 --- a/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0115-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 25569e8a05ead051d52f5a545b1554941516c8bd Mon Sep 17 00:00:00 2001 +From 8891be3ff887e394147125e5b2bf40be1f2dc822 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! diff --git a/CraftBukkit-Patches/0115-Optimize-Player-Lookup.patch b/CraftBukkit-Patches/0115-Optimize-Player-Lookup.patch deleted file mode 100644 index 873ec973cb..0000000000 --- a/CraftBukkit-Patches/0115-Optimize-Player-Lookup.patch +++ /dev/null @@ -1,188 +0,0 @@ -From a24b5a38ec94a03907c3ef650eb9fb6e32f68b76 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Sat, 15 Mar 2014 14:34:03 +1100 -Subject: [PATCH] Optimize Player Lookup - -Optimize player lookup and various player operations. We mainly do this by keeping a map instead of iterating through all players. We also speed up the duplicate login check and a few other checks by simply checking for one matching player. - -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index d2a378e..8a48ec2 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -61,6 +61,25 @@ public abstract class PlayerList { - private boolean s; - private int t; - -+ // Spigot Start -+ private final Map playerMap = new java.util.HashMap(); -+ -+ private void removePlayer(EntityPlayer player) -+ { -+ playerMap.remove( player.getName().toLowerCase() ); -+ } -+ -+ private void addPlayer(EntityPlayer player) -+ { -+ playerMap.put( player.getName().toLowerCase(), player ); -+ } -+ -+ private EntityPlayer getPlayerByName(String name) -+ { -+ return playerMap.get( name.toLowerCase() ); -+ } -+ // Spigot End -+ - // CraftBukkit start - private CraftServer cserver; - -@@ -244,6 +263,7 @@ public abstract class PlayerList { - cserver.detectListNameConflict(entityplayer); // CraftBukkit - // this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, 1000)); // CraftBukkit - replaced with loop below - this.players.add(entityplayer); -+ addPlayer( entityplayer ); // Spigot - WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension); - - // CraftBukkit start -@@ -319,6 +339,7 @@ public abstract class PlayerList { - worldserver.kill(entityplayer); - worldserver.getPlayerChunkMap().removePlayer(entityplayer); - this.players.remove(entityplayer); -+ removePlayer( entityplayer ); // Spigot - this.n.remove(entityplayer.getUniqueID()); - ChunkIOExecutor.adjustPoolSize(this.getPlayerCount()); // CraftBukkit - -@@ -394,24 +415,14 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig - } - - public EntityPlayer processLogin(GameProfile gameprofile, EntityPlayer player) { // CraftBukkit - added EntityPlayer -- UUID uuid = EntityHuman.a(gameprofile); -- ArrayList arraylist = Lists.newArrayList(); -- -- EntityPlayer entityplayer; -+ // Spigot Start -+ EntityPlayer entityplayer = getPlayer( gameprofile.getName() ); - -- for (int i = 0; i < this.players.size(); ++i) { -- entityplayer = (EntityPlayer) this.players.get(i); -- if (entityplayer.getUniqueID().equals(uuid)) { -- arraylist.add(entityplayer); -- } -- } -- -- Iterator iterator = arraylist.iterator(); -- -- while (iterator.hasNext()) { -- entityplayer = (EntityPlayer) iterator.next(); -- entityplayer.playerConnection.disconnect("You logged in from another location"); -+ if ( entityplayer != null ) -+ { -+ entityplayer.playerConnection.disconnect( "You logged in from another location" ); - } -+ // Spigot End - - /* CraftBukkit start - Object object; -@@ -901,19 +912,7 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig - } - - public EntityPlayer getPlayer(String s) { -- Iterator iterator = this.players.iterator(); -- -- EntityPlayer entityplayer; -- -- do { -- if (!iterator.hasNext()) { -- return null; -- } -- -- entityplayer = (EntityPlayer) iterator.next(); -- } while (!entityplayer.getName().equalsIgnoreCase(s)); -- -- return entityplayer; -+ return getPlayerByName( s ); // Spigot - } - - public List a(ChunkCoordinates chunkcoordinates, int i, int j, int k, int l, int i1, int j1, Map map, String s, String s1, World world) { -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index bec4134..0430cc1 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -@@ -131,14 +131,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa - } - - public Player getPlayer() { -- for (Object obj : server.getHandle().players) { -- EntityPlayer player = (EntityPlayer) obj; -- if (player.getUniqueID().equals(getUniqueId())) { -- return (player.playerConnection != null) ? player.playerConnection.getPlayer() : null; -- } -- } -- -- return null; -+ // Spigot Start -+ EntityPlayer player = server.getHandle().getPlayer( name ); -+ return ( player != null && player.playerConnection != null ) ? player.getBukkitEntity() : null; -+ // Spigot End - } - - @Override -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2645c97..ff13c51 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -502,6 +502,13 @@ public final class CraftServer implements Server { - public Player getPlayer(final String name) { - Validate.notNull(name, "Name cannot be null"); - -+ // Spigot Start -+ Player directLookup = getPlayerExact( name ); -+ if ( directLookup != null ) -+ { -+ return directLookup; -+ } -+ // Spigot End - Player[] players = getOnlinePlayers(); - - Player found = null; -@@ -523,15 +530,10 @@ public final class CraftServer implements Server { - public Player getPlayerExact(String name) { - Validate.notNull(name, "Name cannot be null"); - -- String lname = name.toLowerCase(); -- -- for (Player player : getOnlinePlayers()) { -- if (player.getName().equalsIgnoreCase(lname)) { -- return player; -- } -- } -- -- return null; -+ // Spigot Start -+ EntityPlayer entityPlayer = playerList.getPlayer( name ); -+ return ( entityPlayer != null ) ? entityPlayer.getBukkitEntity() : null; -+ // Spigot End - } - - // TODO: In 1.7.6+ this should use the server's UUID->EntityPlayer map -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8af4bf7..8b1ffd6 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -101,13 +101,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - } - - public boolean isOnline() { -- for (Object obj : server.getHandle().players) { -- EntityPlayer player = (EntityPlayer) obj; -- if (player.getName().equalsIgnoreCase(getName())) { -- return true; -- } -- } -- return false; -+ return server.getHandle().getPlayer( getName() ) != null; // Spigot - } - - public InetSocketAddress getAddress() { --- -1.8.3.2 - diff --git a/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch b/CraftBukkit-Patches/0116-Allow-enchanting-tables-to-enchant-any-item.patch similarity index 96% rename from CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch rename to CraftBukkit-Patches/0116-Allow-enchanting-tables-to-enchant-any-item.patch index 08b89997cc..534ff546fa 100644 --- a/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch +++ b/CraftBukkit-Patches/0116-Allow-enchanting-tables-to-enchant-any-item.patch @@ -1,4 +1,4 @@ -From 06daebc4d7b583f854ed3a1913d359d6c9335437 Mon Sep 17 00:00:00 2001 +From aba6ecaf644f983f543b6b3fd8a44de320b91cc4 Mon Sep 17 00:00:00 2001 From: andrepl Date: Sat, 15 Mar 2014 12:50:00 -0400 Subject: [PATCH] Allow enchanting tables to enchant any item diff --git a/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch b/CraftBukkit-Patches/0117-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch similarity index 98% rename from CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch rename to CraftBukkit-Patches/0117-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch index 310123aee6..a210f404af 100644 --- a/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch +++ b/CraftBukkit-Patches/0117-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch @@ -1,4 +1,4 @@ -From 4c278c6fdc194b23a0ed33e9fbd9d94219f66ca1 Mon Sep 17 00:00:00 2001 +From 4904ff3b4497220cbeb724b3e1e49081e5ce2dfa Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 18 Mar 2014 09:49:30 +0000 Subject: [PATCH] Remove the lastChunkAccessed if it is unloaded. diff --git a/CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0118-Check-for-manually-prefixed-commands-or-commands-tha.patch similarity index 95% rename from CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch rename to CraftBukkit-Patches/0118-Check-for-manually-prefixed-commands-or-commands-tha.patch index c03bf01ae3..5591e09fd4 100644 --- a/CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch +++ b/CraftBukkit-Patches/0118-Check-for-manually-prefixed-commands-or-commands-tha.patch @@ -1,4 +1,4 @@ -From 5201ffe0150fb2e5105e28267978e3efea9e793f Mon Sep 17 00:00:00 2001 +From 107d62ed8ad22520af5040e1f24166106e3f9909 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 01:12:10 +0000 Subject: [PATCH] Check for manually prefixed commands or commands that don't diff --git a/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0119-Cap-window-names-to-prevent-client-disconnects.patch similarity index 93% rename from CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch rename to CraftBukkit-Patches/0119-Cap-window-names-to-prevent-client-disconnects.patch index 5e84800b7a..7f91eb272a 100644 --- a/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch +++ b/CraftBukkit-Patches/0119-Cap-window-names-to-prevent-client-disconnects.patch @@ -1,4 +1,4 @@ -From 322c314741c18194c62d033395dbca31b0a2df70 Mon Sep 17 00:00:00 2001 +From 66560851845f64cfb0491c3430a8ed07b095276e Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 10:53:48 +0000 Subject: [PATCH] Cap window names to prevent client disconnects diff --git a/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0120-Enable-Improved-Ping-Sending.patch similarity index 91% rename from CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch rename to CraftBukkit-Patches/0120-Enable-Improved-Ping-Sending.patch index e88edbbb12..82b45f64a8 100644 --- a/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch +++ b/CraftBukkit-Patches/0120-Enable-Improved-Ping-Sending.patch @@ -1,4 +1,4 @@ -From 09287f47fdadb27dcdc39c6914902d94e0e8f514 Mon Sep 17 00:00:00 2001 +From c33df504e1123d58fe8238e9dd238b00643baa79 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved Ping Sending @@ -17,10 +17,10 @@ index 4fb5f75..c164e39 100644 // Spigot start public boolean collidesWithEntities = true; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 8a48ec2..9a052f7 100644 +index d2a378e..9abf099 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -804,6 +804,8 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig +@@ -793,6 +793,8 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig // CraftBukkit end } @@ -29,7 +29,7 @@ index 8a48ec2..9a052f7 100644 public void tick() { if (++this.t > 600) { this.t = 0; -@@ -816,6 +818,30 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig +@@ -805,6 +807,30 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping)); } // CraftBukkit end */ diff --git a/CraftBukkit-Patches/0122-Prevent-getOfflinePlayer-UUID-on-main-thread.patch b/CraftBukkit-Patches/0121-Prevent-getOfflinePlayer-UUID-on-main-thread.patch similarity index 83% rename from CraftBukkit-Patches/0122-Prevent-getOfflinePlayer-UUID-on-main-thread.patch rename to CraftBukkit-Patches/0121-Prevent-getOfflinePlayer-UUID-on-main-thread.patch index 6cc763aca3..1f67e7237d 100644 --- a/CraftBukkit-Patches/0122-Prevent-getOfflinePlayer-UUID-on-main-thread.patch +++ b/CraftBukkit-Patches/0121-Prevent-getOfflinePlayer-UUID-on-main-thread.patch @@ -1,14 +1,14 @@ -From e64d7c0ca438aa60ac1e545928ba2b0c83f5aa6d Mon Sep 17 00:00:00 2001 +From 3ca585448f331bc7961ad0579e3cb5f8e6314215 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 30 Mar 2014 09:15:35 +1100 Subject: [PATCH] Prevent getOfflinePlayer(UUID) on main thread. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ff13c51..7b2242a 100644 +index 2645c97..17ebcce 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1306,6 +1306,7 @@ public final class CraftServer implements Server { +@@ -1304,6 +1304,7 @@ public final class CraftServer implements Server { public OfflinePlayer getOfflinePlayer(String name) { Validate.notNull(name, "Name cannot be null"); diff --git a/CraftBukkit-Patches/0123-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 98% rename from CraftBukkit-Patches/0123-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch index d8c9ee999d..7106afe6fb 100644 --- a/CraftBukkit-Patches/0123-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 67ea2bb8feb99fa189e87a05ff37aff6dff241a0 Mon Sep 17 00:00:00 2001 +From 5f16a34374e9bbd0b7aed359e2b3cc236ab0f5a0 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/CraftBukkit-Patches/0124-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch similarity index 95% rename from CraftBukkit-Patches/0124-Fix-TileEntities-getting-ticked-after-being-queued-f.patch rename to CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch index 780d0176ee..a548e4222d 100644 --- a/CraftBukkit-Patches/0124-Fix-TileEntities-getting-ticked-after-being-queued-f.patch +++ b/CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch @@ -1,4 +1,4 @@ -From 5d529ca00299e2f3aab97a98aa6975ddc317acd6 Mon Sep 17 00:00:00 2001 +From 43f56ba461edd0a4d4c77a14b2628ab91bbc0e92 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 23 Mar 2014 01:49:13 +0100 Subject: [PATCH] Fix TileEntities getting ticked after being queued for diff --git a/CraftBukkit-Patches/0125-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 92% rename from CraftBukkit-Patches/0125-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index b4ad11bac8..ab1b0572aa 100644 --- a/CraftBukkit-Patches/0125-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From e479193f877f9c8b674a2319599843af75e8c539 Mon Sep 17 00:00:00 2001 +From 42f834d1bd2a0f85ab7ab451f7a6fb272e99c983 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang