spigot/CraftBukkit-Patches/0035-Player-Collision-API.patch

31 lines
1,004 B
Diff
Raw Normal View History

2016-06-12 19:30:52 +10:00
From 2985eabb31cff400d06dfa89e8c83f09b724d015 Mon Sep 17 00:00:00 2001
2016-03-27 20:36:54 +11:00
From: md_5 <git@md-5.net>
Date: Sun, 27 Mar 2016 20:35:09 +1100
2014-04-12 14:18:37 +10:00
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2016-06-12 19:30:52 +10:00
index 85b099a..5644990 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2016-06-12 19:30:52 +10:00
@@ -1424,6 +1424,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2014-04-12 14:18:37 +10:00
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{
+
+ @Override
2016-03-27 20:36:54 +11:00
+ public boolean getCollidesWithEntities() {
+ return CraftPlayer.this.isCollidable();
2014-04-12 14:18:37 +10:00
+ }
+
+ @Override
2016-03-27 20:36:54 +11:00
+ public void setCollidesWithEntities(boolean collides) {
+ CraftPlayer.this.setCollidable(collides);
2014-04-12 14:18:37 +10:00
+ }
};
public Player.Spigot spigot()
--
2016-05-10 21:48:25 +10:00
2.7.4
2014-04-12 14:18:37 +10:00