aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0772-Collision-API.patch
diff options
context:
space:
mode:
authorFireInstall <[email protected]>2024-03-23 20:27:30 +0100
committerGitHub <[email protected]>2024-03-23 20:27:30 +0100
commit9ec7dfcbc41c6e625de0050b6997160a75df9f44 (patch)
treeecfae4a17b8258b5ceb8fa4cb340e023b8031e8a /patches/server/0772-Collision-API.patch
parent88419b207579533646ab011da886030ea9ea4862 (diff)
downloadPaper-9ec7dfcbc41c6e625de0050b6997160a75df9f44.tar.gz
Paper-9ec7dfcbc41c6e625de0050b6997160a75df9f44.zip
Move invisible setting up to entities (#10346)
Diffstat (limited to 'patches/server/0772-Collision-API.patch')
-rw-r--r--patches/server/0772-Collision-API.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/patches/server/0772-Collision-API.patch b/patches/server/0772-Collision-API.patch
index c4952054b5..da2d02ef43 100644
--- a/patches/server/0772-Collision-API.patch
+++ b/patches/server/0772-Collision-API.patch
@@ -22,13 +22,14 @@ index fbcf1320ef9c1817b24aa8724cd6cf07319c20b9..5680e9772a2d90e997d2d0aacdda9edd
// Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9ea189c26c6a5fae84bcc7ed098426d8c001cd5e..b7fceba1c7138a5c1d78bf058c9f2d32dbc1d292 100644
+index a47e8994b52576d88fa90b7a86cbe0fb7493fa6d..3cdc8787c6a481da6cb294208eebce0636a58d4f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1125,4 +1125,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
- return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
+@@ -1138,4 +1138,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+ this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible);
}
- // Paper end
+ // Paper end - move up invisibility
++
+ // Paper start - Collision API
+ @Override
+ public boolean collidesAt(@org.jetbrains.annotations.NotNull Location location) {