mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +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:
@@ -121,10 +121,10 @@ index cb211e2aad3cc300099b724b7fa78cc4f24aee7c..4142e454d10e6ea3996e1ae372fcb140
|
||||
return entityplayer1;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index ee6d2faa7ca9d6bc43b08192ecbcebb36e679df1..8164cb0e40057c05fafdfe036a64ce4da2b9bbbd 100644
|
||||
index aeea585b802966cd599e33a45887899cad31872b..c7fcf3da9ebfe139dd1777c17d5c62a9b9d5e039 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -3215,5 +3215,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -3214,5 +3214,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void resetIdleTimer() {
|
||||
getHandle().resetLastActionTime();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user