mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9a19308 Lock Frozen Ticks API (#7207) PaperMC/Paper@a058ac0 Dolphin API (#7102) PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334) PaperMC/Paper@7978121 More PotionEffectType API (#5737) PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable damage settings for magma blocks
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index a0f999ee0560e7ce773665e70abddfc2e6b580bb..97e27e2824a18cfbe8bba5599102702a99f3bf11 100644
|
||||
index 8df3bf860fcdb9d3df9dea28c02e37183b6f338c..a0dfd64a6bd7da1e15abf12e82648d7d781152f5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -1057,7 +1057,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
|
||||
@@ -1058,7 +1058,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user