SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add missed method to the Player Collision API

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 18:16:32 +00:00
parent 26df4f1c88
commit 10de9c0a8b
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0047-Player-Collision-API.patch
View File

@@ -1,4 +1,4 @@
From c8e14405ce9b28101adaa15d95495fbed43b5eda Mon Sep 17 00:00:00 2001
From b807256e061290c356ef0ea54f4e82797114a57f 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
@@ -31,10 +31,10 @@ index 57157ef..c04ff95 100644
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 4c06a42..bd18f4d 100644
index 4c06a42..994edde 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -64,6 +64,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -64,6 +64,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public boolean joining = true;
public int lastPing = -1; // Spigot
// CraftBukkit end
@@ -42,6 +42,12 @@ index 4c06a42..bd18f4d 100644
+ public boolean collidesWithEntities = true;
+
+ @Override
+ public boolean Q()
+ {
+ return this.collidesWithEntities && super.Q();
+ }
+
+ @Override
+ public boolean R()
+ {
+ return this.collidesWithEntities && super.R();
@@ -75,5 +81,5 @@ index 07c8a2c..296e20a 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.5.2.msysgit.0