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

Stage two done

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-01 16:17:16 +11:00
parent 40affc9057
commit 1962fb3011
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0052-Player-Collision-API.patch
View File

@@ -1,4 +1,4 @@
From 7c62ad80df53048515179a7866b5918f8cd3f519 Mon Sep 17 00:00:00 2001
From d91a8eb52fb822cea177f0ad19670574f2858c64 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,7 +31,7 @@ index a61001d..35d30f1 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 af08d2f..d6a384b 100644
index af08d2f..12e90cc 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -64,6 +64,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -42,22 +42,22 @@ index af08d2f..d6a384b 100644
+ public boolean collidesWithEntities = true;
+
+ @Override
+ public boolean L()
+ public boolean S()
+ {
+ return this.collidesWithEntities && super.L();
+ return this.collidesWithEntities && super.S();
+ }
+
+ @Override
+ /*@Override
+ public boolean M()
+ {
+ return this.collidesWithEntities && super.M();
+ }
+ }*/ // SPIGOT TODO
+ // 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 0b8b324..fb53781 100644
index 0b8b324..67e7747 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1130,6 +1130,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -75,7 +75,7 @@ index 0b8b324..fb53781 100644
+ public void setCollidesWithEntities(boolean collides)
+ {
+ getHandle().collidesWithEntities = collides;
+ getHandle().m = collides; // First boolean of Entity
+ getHandle().l = collides; // First boolean of Entity
+ }
};