Update with latest patches from upstream SpigotMC

This commit is contained in:
Byteflux
2014-09-21 22:05:59 -05:00
parent 4c10135801
commit 64acfb63bc
9 changed files with 1379 additions and 41 deletions

View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 8 Aug 2014 22:51:26 -0500
Date: Sun, 21 Sep 2014 22:02:02 -0500
Subject: [PATCH] Player affects spawning API
@@ -110,8 +110,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
getHandle().playerConnection.sendPacket( packet );
}
}
+
+ // PaperSpigot start - Add affects spawning API
@@ -123,6 +123,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return getHandle().affectsSpawning;
+ }
+ // PaperSpigot end
+
};
public Player.Spigot spigot()