Update from upstream SpigotMC

c5492f80081 d5bf8668b99 a93b19a04cd
2014-12-09 19:58:37 -06:00 · 2014-12-09 19:58:37 -06:00 · 1c211713c6
Commit 1c211713c6
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@ -1,14 +1,14 @@
-From ecda9a1d2be3ef373f18043aeb95e4da04c1aebd Mon Sep 17 00:00:00 2001
+From 42e5c2b701d1668517704cdfe245760085e28c71 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes


 diff --git a/pom.xml b/pom.xml
-index 5cecb1e..eedbc20 100644
+index 45e795c..5048996 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,15 +1,29 @@
+@@ -1,15 +1,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.bukkit</groupId>
@ -25,13 +25,6 @@ index 5cecb1e..eedbc20 100644
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-+    <parent>
-+        <groupId>org.spigotmc</groupId>
-+        <artifactId>spigot-parent</artifactId>
-+        <version>dev-SNAPSHOT</version>
-+        <relativePath>../pom.xml</relativePath>
-+    </parent>
-+
 +    <repositories>
 +        <repository>
 +            <id>sonatype-snapshots</id>
--- a/Bukkit-Patches/0002-Spigot-Timings.patch
+++ b/Bukkit-Patches/0002-Spigot-Timings.patch
@ -1,4 +1,4 @@
-From 06701983001af96d02a1cc0ebf29b2d251d8d0bc Mon Sep 17 00:00:00 2001
+From ed342265a160060c6a373332c7736dc3f84d4c1f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Spigot Timings
@ -78,10 +78,10 @@ index e5fb0f8..e4c60ca 100644
             return true;
         }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index d75380c..f15b95d 100644
+index a229d08..a08a49d 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -176,11 +176,15 @@ public class SimpleCommandMap implements CommandMap {
+@@ -136,11 +136,15 @@ public class SimpleCommandMap implements CommandMap {
         }
 
         try {
--- a/Bukkit-Patches/0009-Update-Depends.patch
+++ b/Bukkit-Patches/0009-Update-Depends.patch
@ -1,4 +1,4 @@
-From fa35c0b59b538ef892de56bb7cb8eb3b190b3831 Mon Sep 17 00:00:00 2001
+From fde5763e08be055830e582208e8c3fd04cf55066 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 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 1324616..bd70b0d 100644
+index 5048996..17f976d 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -94,21 +94,21 @@
+@@ -87,21 +87,21 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
@ -34,7 +34,7 @@ index 1324616..bd70b0d 100644
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
-@@ -123,7 +123,7 @@
+@@ -116,7 +116,7 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
--- a/Bukkit-Patches/0018-Fix-Tab-Completion-for-Some-Commands.patch
+++ b/Bukkit-Patches/0018-Fix-Tab-Completion-for-Some-Commands.patch
@ -1,4 +1,4 @@
-From b21c6424ec427aad72d53accf9236ffe7eb812f5 Mon Sep 17 00:00:00 2001
+From ae4065bed1e879011f318af1bba1c8cdfaa7951c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 24 Dec 2013 10:14:25 +1100
 Subject: [PATCH] Fix Tab Completion for Some Commands
@ -39,10 +39,10 @@ index fb3c90f..a08ae80 100644
 +    // Spigot End
 }
 diff --git a/src/main/java/org/bukkit/command/defaults/TellCommand.java b/src/main/java/org/bukkit/command/defaults/TellCommand.java
-index 287f49f..fc49207 100644
+index 7b0a41c..2e5d811 100644
 --- a/src/main/java/org/bukkit/command/defaults/TellCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/TellCommand.java
-@@ -45,4 +45,16 @@ public class TellCommand extends VanillaCommand {
+@@ -46,4 +46,16 @@ public class TellCommand extends VanillaCommand {
 
         return true;
     }
@ -60,10 +60,10 @@ index 287f49f..fc49207 100644
 +    // Spigot End
 }
 diff --git a/src/main/java/org/bukkit/command/defaults/TestForCommand.java b/src/main/java/org/bukkit/command/defaults/TestForCommand.java
-index c9ac1ce..a687fef 100644
+index 7e5494d..e168b49 100644
 --- a/src/main/java/org/bukkit/command/defaults/TestForCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/TestForCommand.java
-@@ -23,4 +23,16 @@ public class TestForCommand extends VanillaCommand {
+@@ -24,4 +24,16 @@ public class TestForCommand extends VanillaCommand {
         sender.sendMessage(ChatColor.RED + "/testfor is only usable by commandblocks with analog output.");
         return true;
     }
--- a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch
+++ b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch
@ -1,4 +1,4 @@
-From e127c24f68c61577500ba258b36373e659b261a7 Mon Sep 17 00:00:00 2001
+From 69caadfa860617c30596bae5eefc58b7bd1a558e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 22 Jul 2014 21:01:32 +1000
 Subject: [PATCH] Fix slow tab complete for some commands.
@ -6,10 +6,10 @@ Subject: [PATCH] Fix slow tab complete for some commands.
 Use online players instead of offline players, which is very slow.

 diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
-index b3fa4f8..6559b33 100644
+index 92de43c..855f560 100644
 --- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
-@@ -104,7 +104,7 @@ public class WhitelistCommand extends VanillaCommand {
+@@ -105,7 +105,7 @@ public class WhitelistCommand extends VanillaCommand {
         } else if (args.length == 2) {
             if (args[0].equalsIgnoreCase("add")) {
                 List<String> completions = new ArrayList<String>();
--- a/CraftBukkit-Patches/0012-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch
@ -1,4 +1,4 @@
-From 205584cab09286718c021a5629b3f4a76b67a723 Mon Sep 17 00:00:00 2001
+From e18afad9c20b61ae0d88452917aca5605b267302 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@ -367,10 +367,10 @@ index 5e53661..49429d7 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 0d384bb..491b5f0 100644
+index 38ca035..d3530c9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1032,6 +1032,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1042,6 +1042,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
     // CraftBukkit end
 
     private void handleCommand(String s) {
@ -379,7 +379,7 @@ index 0d384bb..491b5f0 100644
        // CraftBukkit start - whole method
         this.c.info(this.player.getName() + " issued server command: " + s);
 
-@@ -1041,18 +1043,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1051,18 +1053,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         this.server.getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
--- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch
@ -1,14 +1,14 @@
-From 0b7f9ce9fdbc33a17dd99d38b358084fb6c67a6e Mon Sep 17 00:00:00 2001
+From ab0d44cd1966433c726535a9f23c1c20b4d3f08f 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


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 491b5f0..7f8b0fc 100644
+index d3530c9..848db10 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1035,6 +1035,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1045,6 +1045,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
 
        // CraftBukkit start - whole method
--- a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch
@ -1,14 +1,14 @@
-From 7dac437336bc9676d51a006e30e17f4634272a26 Mon Sep 17 00:00:00 2001
+From edc3955277f82092b8c00b0dcd136f838971e666 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


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7f8b0fc..960d0b9 100644
+index 848db10..1780f9a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1169,6 +1169,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1179,6 +1179,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
         PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
         WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
         Entity entity = packetplayinuseentity.a((World) worldserver);
--- a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch
@ -1,14 +1,14 @@
-From e2ba22e4578afa895b8ff0ff3ab7d11cdac6e778 Mon Sep 17 00:00:00 2001
+From 9effba200f83e9154741bcf1311914d38acb3f68 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 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 80dc5ed..dd731e6 100644
+index 0839eff..22f1300 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -941,9 +941,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -951,9 +951,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                 this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
             }
 
--- a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch
@ -1,14 +1,14 @@
-From 691d9ddb1855bd5326e91650e44976d2cdbbdb14 Mon Sep 17 00:00:00 2001
+From 747cc64e39ce11f96da45d416f1c295faa96c062 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 18:18:01 +1100
 Subject: [PATCH] Allow Disabling Creative Item Filter


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dd731e6..b9f6200 100644
+index 22f1300..5c425c3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1670,7 +1670,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1680,7 +1680,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
 
             boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
             // CraftBukkit - Add invalidItems check
--- a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@ -1,4 +1,4 @@
-From 371378e63d7d6dda60ce5226be670d8d25edc3b9 Mon Sep 17 00:00:00 2001
+From f0f17b0b2d63657ccda01f0264b204842c133bac Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b9f6200..0acf91a 100644
+index 5c425c3..b8a920a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2027,7 +2027,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -2037,7 +2037,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
     }
 
     // CraftBukkit start - Add "isDisconnected" method
--- a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch
@ -1,4 +1,4 @@
-From 43e9fcaf8f465b0605e878cefa801dfeb59074d1 Mon Sep 17 00:00:00 2001
+From 928d3c2a993a4eea994e4c46121f546d123277d0 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
@ -27,7 +27,7 @@ index 774fe84..3a68762 100644
             f1 = 0;
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0acf91a..f3fdd6e 100644
+index b8a920a..c4304ba 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -186,7 +186,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -39,7 +39,7 @@ index 0acf91a..f3fdd6e 100644
             return;
         }
         // CraftBukkit end
-@@ -864,7 +864,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -874,7 +874,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
             this.player.z();
         } else {
             PlayerConnection.c.warn(this.player.getName() + " tried to set an invalid carried item");
--- a/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch
+++ b/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch
@ -1,4 +1,4 @@
-From 7606cd78b49a3b5a0e7864a528a06a9f78955c42 Mon Sep 17 00:00:00 2001
+From d7364b8b8dabbb570b85867c3b940903d21136ef Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f3fdd6e..7ff587b 100644
+index c4304ba..208757d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -926,7 +926,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -936,7 +936,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
             } else if (s.isEmpty()) {
                 c.warn(this.player.getName() + " tried to send an empty message");
             } else if (getPlayer().isConversing()) {
--- a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch
@ -1,11 +1,11 @@
-From 06d434b6ee068029e1ae6ac736ef2956d057c151 Mon Sep 17 00:00:00 2001
+From 809c0879c594cde6164d9614324493204ef4a700 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7ff587b..6ba95d4 100644
+index 208757d..2fa99b3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -616,9 +616,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -41,8 +41,8 @@ index 7ff587b..6ba95d4 100644
             // Raytrace to look for 'rogue armswings'
             float f1 = this.player.pitch;
             float f2 = this.player.yaw;
-@@ -668,6 +682,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
-             if (event == null || event.useItemInHand() != Event.Result.DENY) {
+@@ -678,6 +692,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+             if (!cancelled) {
                 this.player.playerInteractManager.useItem(this.player, this.player.world, itemstack);
             }
 +            }
@ -50,7 +50,7 @@ index 7ff587b..6ba95d4 100644
 
             // CraftBukkit - notch decrements the counter by 1 in the above method with food,
             // snowballs and so forth, but he does it in a place that doesn't cause the
-@@ -693,7 +709,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -703,7 +719,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
             }
 
             if (this.checkMovement && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.af().a(blockposition)) {