mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e574412 Replace ConfiguredStructure api with Structure (#8642) PaperMC/Paper@a172880 Update ForgeFlower to 2.0.627.2, fixes dev bundle not applying with Java 19 runtime PaperMC/Paper@4151f75 /paper entity list QOL improvements (#8876) PaperMC/Paper@8a815a0 Fix rendering for translatable death messages (#8534) PaperMC/Paper@d30cda1 Add TeleportFlags (#8855) PaperMC/Paper@3dcf4e4 Add EntityFertilizeEggEvent (#8041) PaperMC/Paper@f2075c4 Take in account waterlogged block for the event (#8623) PaperMC/Paper@e5e75dd Include previous spawn angle in SpawnChangeEvent (#8606) PaperMC/Paper@541753b Fix HumanEntity#drop not updating the client inventory (#6761)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index b9577cfb29f4339622548ad95dbb0130d6a36798..612ffc2922a73fba2b9e0b9aa341dcca1c359008 100644
|
||||
index ad29585f35a407afb3c383f5006ed9eacfb53c72..a3db3b591dc75e9e904e395d56b9c6cf03b5dafe 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1448,6 +1448,42 @@ public final class CraftServer implements Server {
|
||||
@@ -1447,6 +1447,42 @@ public final class CraftServer implements Server {
|
||||
public void removeFuel(org.bukkit.Material material) {
|
||||
net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
|
||||
}
|
||||
@@ -52,7 +52,7 @@ index b9577cfb29f4339622548ad95dbb0130d6a36798..612ffc2922a73fba2b9e0b9aa341dcca
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index ba570a518f2bcdb23fd2118663c2b82e7484629d..9b5323edd99848b73ea0e34230e7bec8dc23be8c 100644
|
||||
index 331646e5be8c626d75738cb05742d31e909efb8f..6a327616cd590b70170f8441c003a2109640201d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -2257,6 +2257,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||||
@@ -99,10 +99,10 @@ index ba570a518f2bcdb23fd2118663c2b82e7484629d..9b5323edd99848b73ea0e34230e7bec8
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index ddf2c679ada43bfb209656dbcaca0fa8aef8ed24..660a2a8d17325014cc3f8ba33faaadc6fb5b80eb 100644
|
||||
index 171ba11eefe137f8bb88c7e3e1ac0f2a3efc3474..f3e849827c091adfa19c206d63ccd265897062ef 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -3125,5 +3125,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -3133,5 +3133,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
|
||||
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user