mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ed79fc9 Add Player#getFishHook (#7988) PaperMC/Paper@41647af Do not use worldgen executor for api profile completions
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
group = org.purpurmc.purpur
|
group = org.purpurmc.purpur
|
||||||
version = 1.19-R0.1-SNAPSHOT
|
version = 1.19-R0.1-SNAPSHOT
|
||||||
|
|
||||||
paperCommit = 9d0650ed601df789c129eb06160627d117922941
|
paperCommit = 41647af74caed955c1fd5b38d458ee59298ae5d4
|
||||||
|
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
org.gradle.parallel = true
|
org.gradle.parallel = true
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ index a4b46199099c654d6fb6373e0cf340dd69bd7bf8..1eb57eeaec24570cade410f40de9e8c2
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
index 6149e74262ca6c4c00686a89c273c59bfaac3e05..c0c94f76f44cf541bbaaec8bf9cc0a4c1267c19a 100644
|
index c0a7b7bb9757de55424188629087d2ec82479e3c..dabbb41c9a7b0a825a241143ae7c196fceff3d60 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
@@ -246,6 +246,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
@@ -255,6 +255,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||||
@Override
|
@Override
|
||||||
public void recalculatePermissions() {
|
public void recalculatePermissions() {
|
||||||
this.perm.recalculatePermissions();
|
this.perm.recalculatePermissions();
|
||||||
|
|||||||
Reference in New Issue
Block a user