86 lines
3.3 KiB
Diff
86 lines
3.3 KiB
Diff
From 9d73975f8eba9e17bc92818862e36e7645302a24 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 adb27d8..0a35df8 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -411,7 +411,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
|
|
|
|
List list = this.world.getEntities(this, axisalignedbb);
|
|
|
|
- if (list != null) {
|
|
+ if (list != null && this.L()) { // Spigot: Add this.L() 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 6b8b8dd..34683a5 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -1462,7 +1462,7 @@ public abstract class EntityLiving extends Entity {
|
|
protected void bi() {
|
|
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
|
|
|
- if (list != null && !list.isEmpty()) {
|
|
+ if (this.L() && list != null && !list.isEmpty()) { // Spigot: Add this.L() 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 f9ac1e1..9ff8c86 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -54,6 +54,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
public double maxHealthCache;
|
|
public int lastPing = -1; // Spigot
|
|
// CraftBukkit end
|
|
+ // Spigot start
|
|
+ public boolean collidesWithEntities = true;
|
|
+
|
|
+ @Override
|
|
+ public boolean L()
|
|
+ {
|
|
+ return this.collidesWithEntities && super.L();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean K()
|
|
+ {
|
|
+ return this.collidesWithEntities && super.K();
|
|
+ }
|
|
+ // Spigot end
|
|
|
|
public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
|
|
super(world, s);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 3231226..1e415db 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1122,6 +1122,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
|
|
getHandle().playerConnection.sendPacket( packet );
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean getCollidesWithEntities()
|
|
+ {
|
|
+ return getHandle().collidesWithEntities;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCollidesWithEntities(boolean collides)
|
|
+ {
|
|
+ getHandle().collidesWithEntities = collides;
|
|
+ getHandle().m = collides; // First boolean of Entity
|
|
+ }
|
|
};
|
|
|
|
public Spigot spigot()
|
|
--
|
|
1.8.1.2
|
|
|