mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: d0ad658b Fix slime block in Anti-Xray c64ad85b Fixed TileEntityBell memory leak a84348b6 Add player elytra boost API 6dad6258 Fix item locations dropped from campfires
This commit is contained in:
@@ -268,10 +268,10 @@ index 361f7857e..2578a4677 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index fb1852ea6..d32c9c9cd 100644
|
||||
index 9f04172fb..6db07713e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2178,4 +2178,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2192,4 +2192,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
return spigot;
|
||||
}
|
||||
// Spigot end
|
||||
|
||||
@@ -108,10 +108,10 @@ index 2578a4677..c441fcea9 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index d32c9c9cd..d074392be 100644
|
||||
index 6db07713e..7d04913f9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2194,5 +2194,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2208,5 +2208,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void resetIdleTimer() {
|
||||
getHandle().resetIdleTimer();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user