Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2b4b6d14 PR-1023: Convert InventoryView to interface CraftBukkit Changes: 68603b1c1 Use expanded interaction ranges for traced interact events eae9f760c PR-1414: Convert InventoryView to interface ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
This commit is contained in:
parent
ec4c712efa
commit
e1c0033552
182 changed files with 144 additions and 144 deletions
|
@ -175,7 +175,7 @@ index 60eac9df10a9a395a1568925515d010eb51a64e5..55fd997a4e894eeab24de269d59e4861
|
|||
|
||||
if (flag && entity instanceof LivingEntity entityliving) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java
|
||||
index 5572c50cac4968e3ec75fe1fc98442407bc3b905..7df86e7124a9ed359f05324b8fc4c8862f7e4b79 100644
|
||||
index 8532324060eed772a10e2a3429890438cf32f9ba..7df86e7124a9ed359f05324b8fc4c8862f7e4b79 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java
|
||||
@@ -41,13 +41,13 @@ public class CraftDamageSource implements DamageSource {
|
||||
|
@ -198,7 +198,7 @@ index 5572c50cac4968e3ec75fe1fc98442407bc3b905..7df86e7124a9ed359f05324b8fc4c886
|
|||
|
||||
@Override
|
||||
public boolean isIndirect() {
|
||||
- return this.getHandle().getEntity() != this.getHandle().getDamager();
|
||||
- return this.getHandle().getCausingDamager() != this.getHandle().getDamager();
|
||||
+ return !this.getHandle().isDirect(); // Paper - fix DamageSource API
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue