86 lines
3.4 KiB
Diff
86 lines
3.4 KiB
Diff
|
From 4f191736ede09810d6a941c601d2ebe74c793797 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 e2e7b9c..5b50df0 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 9b80aef..b519903 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 8a09d97..0c1d655 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -1290,6 +1290,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.3.2
|
||
|
|
|