mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 10:57:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@51fe7aaa Fixed modern forwarding support (#13098) PaperMC/Paper@5613a359 fix PlayerGameModeChangeEvent#cancelMessage PaperMC/Paper@673abf4b use PlayerShieldDisableEvent#getCooldown PaperMC/Paper@3a0dc7fa Fix a couple PlayerProfile mutability issues PaperMC/Paper@e97fb404 Remove parallel generation config option PaperMC/Paper@c3a60b8d Use ThreadLocal for Starlight and ticket level propagator cache PaperMC/Paper@e16b369f Resize propagator queues less aggressively PaperMC/Paper@922c85fe Add GAMEMODE_SWITCHER gamemode change cause (#13097) PaperMC/Paper@c1013989 remove old configs PaperMC/Paper@f57fd541 remove api scheduled for removal
This commit is contained in:
@@ -24,10 +24,10 @@ index e5d23a8d571fda492bc6dd6ee6694f175ff30ba1..5e46428e5dd24c581c816125b52cb32d
|
||||
Preconditions.checkArgument(entity != null, "Unknown entity");
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
index 1ed274542d32a5efbf8af4d5a0f197c98902f810..1e79357a3f31efd479720e78821962e5d6ff6db4 100644
|
||||
index 0d9c2a68dd665aec471f57c370a139f03e97718c..3e79cebf42b61afedd3893aee04ab051fe403280 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
@@ -1142,4 +1142,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
@@ -1132,4 +1132,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
public CombatTracker getCombatTracker() {
|
||||
return this.getHandle().getCombatTracker().paperCombatTracker;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user