Stage 1.5

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0046-Player-Collision-API.patch

@@ -1,85 +0,0 @@
-From 2d1c5eb57b7b0407cbaaf89c84200d6037754f6d Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Sat, 3 Aug 2013 19:27:07 +1000
-Subject: [PATCH] Player Collision API
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index eaf823c..a0f4dfc 100644
---- a/src/main/java/net/minecraft/server/EntityHuman.java
-+++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -430,7 +430,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
- 
-             List list = this.world.getEntities(this, axisalignedbb);
- 
--            if (list != null) {
-+            if (list != null && this.R()) { // Spigot: Add this.R() condition
-                 for (int i = 0; i < list.size(); ++i) {
-                     Entity entity = (Entity) list.get(i);
- 
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3758411..90c0e82 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1490,7 +1490,7 @@ public abstract class EntityLiving extends Entity {
-     protected void bn() {
-         List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
- 
--        if (list != null && !list.isEmpty()) {
-+        if (this.R() && list != null && !list.isEmpty()) { // Spigot: Add this.R() condition
-             for (int i = 0; i < list.size(); ++i) {
-                 Entity entity = (Entity) list.get(i);
- 
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8d98a70..d32a2d2 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -63,6 +63,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public double maxHealthCache;
-     public boolean joining = true;
-     // CraftBukkit end
-+    // Spigot start
-+    public boolean collidesWithEntities = true;
-+
-+    @Override
-+    public boolean Q()
-+    {
-+        return this.collidesWithEntities && super.Q();
-+    }
-+
-+    @Override
-+    public boolean R()
-+    {
-+        return this.collidesWithEntities && super.R();
-+    }
-+    // Spigot end
- 
-     public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
-         super(worldserver, gameprofile);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3fee3e8..25de653 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1280,6 +1280,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     // Spigot start
-     private final Player.Spigot spigot = new Player.Spigot()
-     {
-+
-+        @Override
-+        public boolean getCollidesWithEntities()
-+        {
-+            return getHandle().collidesWithEntities;
-+        }
-+
-+        @Override
-+        public void setCollidesWithEntities(boolean collides)
-+        {
-+            getHandle().collidesWithEntities = collides;
-+            getHandle().k = collides; // First boolean of Entity
-+        }
-     };
- 
-     public Player.Spigot spigot()
--- 
-1.8.5.2.msysgit.0
-