mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-20 18:28:15 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@93829bb Account for dimension type in portal void damage check (#9602) PaperMC/Paper@a73ed95 Updated Upstream (CraftBukkit/Spigot) (#9598)
This commit is contained in:
@@ -5189,10 +5189,10 @@ index 06d1bdb9bd124b201c36d284c50d22bf50d3735a..937f57d8af629c4e913d7ccabf6adab1
|
||||
public boolean isPickable() {
|
||||
return false;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index fc0dc8e607cc24020106ea1af92b4421a5f9393d..7d744d5b6a9e593e657233b2192f2837bf360deb 100644
|
||||
index 6e600f9d81178f4ad10967a1aba802c9ac853d82..489c6cf86508d3e143490bee02e6843a0cb42b86 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -1450,4 +1450,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -1461,4 +1461,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
return !this.getHandle().level().noCollision(this.getHandle(), aabb);
|
||||
}
|
||||
// Paper End - Collision API
|
||||
|
||||
Reference in New Issue
Block a user