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

31 lines
1,009 B
Diff
Raw Normal View History

2017-09-18 20:00:00 +10:00
From 1b3832460ea6eb0b1b3c9dbdbf10e8fa00acf9c4 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
2017-09-18 20:00:00 +10:00
index 9bc317bde..806e594ee 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
2017-07-26 13:22:16 +10:00
@@ -1485,6 +1485,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()
--
2017-04-30 09:32:32 +10:00
2.11.0
2014-04-12 14:18:37 +10:00