Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733)
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740)
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
granny
2022-04-16 05:03:34 -07:00
parent daeb232e18
commit d4c11601c7
45 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0264-Lobotomize-stuck-villagers.patch
View File

@@ -95,10 +95,10 @@ index 59bfaf90d448223c5aee9b18d2915539f54f0d4b..b5db8212aa6b20fbaa8ea7dbcd14c9cc
if (this.assignProfessionWhenSpawned) {
this.assignProfessionWhenSpawned = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
index dbc1ea96223675fbe03585598a9c7f51acc61d2e..dde09a8495270d9038f55974e252576095259ca9 100644
index 6de6553e79c9729ef49e2a544730b1ac1020dff2..1c9f3b42cbd0aa423e2f7b96ea9c68e2a3260ec6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
@@ -187,4 +187,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
@@ -193,4 +193,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
getHandle().getGossips().getReputations().clear();
}
// Paper end
@@ -111,7 +111,7 @@ index dbc1ea96223675fbe03585598a9c7f51acc61d2e..dde09a8495270d9038f55974e2525760
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e4e75914042b6e1024662ef59b2190865a879759..973cec1676fe533a8e4aa268aa15dda135d43367 100644
index a5ec57fc61835e9dd69bc2222084e13018c459bb..2dc8f909431735aa31dd9ac93cba93dbab98b405 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2666,6 +2666,8 @@ public class PurpurWorldConfig {