mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5ffdff8 Fix a couple of bed bugs (#9112) PaperMC/Paper@e338793 Optimize hoppers by not trying to merge full items. (#9110) PaperMC/Paper@bd35d60 [ci-skip] Fix missing closing quote (#9126) PaperMC/Paper@8d040fa Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
@@ -99,10 +99,10 @@ index ada46470d5b774d44b16a6f22fffeae631576690..b5415f0c65db728f4a935b87b54fa14b
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 3485b10b9c4550fb0ce431a46cfa99b64eb7a4f6..96dfcbd7160231a58b051d38b131ee000932da22 100644
|
||||
index 133219dae9fb76418c77a18f225aff154b07ebb9..6691b33592466c7088c24b14a2851b17a837d301 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -3256,5 +3256,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -3255,5 +3255,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
|
||||
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user