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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@29b17a8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9088)
PaperMC/Paper@b5ce6e3 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9104)
PaperMC/Paper@9cda284 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@f8c0112 {ci skip} add missing labels to project status map (#9106)
PaperMC/Paper@6a7fef0 Allow entity effect changes off the main thread for worldgen (#8942)
PaperMC/Paper@f8d2f82 Resolve Plugin Dependency Issues, Improve PluginLoading Compat, Small Loading Issues (#9068)
PaperMC/Paper@b626528 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@058d7c1 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@ab72b12 Update Adventure to 4.13.1 (#9113)
PaperMC/Paper@8be7a60 Fix getBrightness and getRawBrightness throwing exception in BlockStateListPopulator (#9111)
PaperMC/Paper@e811927 Revert "Resolve Plugin Dependency Issues, Improve PluginLoading Compat, Small Loading Issues (#9068)"

Pufferfish Changes:
pufferfish-gg/Pufferfish@da9fd85 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@751dfb0 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@c09a154 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@b778163 Updated Upstream (Paper)
This commit is contained in:
granny
2023-04-10 04:06:22 -07:00
parent 1407eef7e0
commit f952106e1b
56 changed files with 238 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0232-Mobs-always-drop-experience.patch
View File

@@ -725,10 +725,10 @@ index cdc431608384b04b480a9cfdc603a28a178e3dd2..4e5b9f772ba587b4e108add3758dffa6
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
index 52d4a0975b1fec03fdd51b8fad8127a79e216be0..73e973e10f767d0efe0e0410d97c6892c4ea35d8 100644
index 85a075b8224feed2daaa9978d3a1d23f1334ce6f..f10304b38e904528907cb36c342acf9d49935edd 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
@@ -99,6 +99,11 @@ public class Guardian extends Monster {
@@ -101,6 +101,11 @@ public class Guardian extends Monster {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.guardianTakeDamageFromWater;
}
@@ -1157,7 +1157,7 @@ index 6af1d1b3b40d91fd3e0ac269d0e4a60a104be7b8..fef9fd3e50bba3d0fffa3d61b60f3bb8
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 417eade17d21c6fc2f0da5bb192bcb2e1e3a778a..502ead7161022974ee10fc3e3282bd0ba63fc3ad 100644
index 94670e18d27875a5fca3b76ee0ebb329cfb59bd1..68569fffd660552388dd58b2dbc8b1932f068263 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1019,12 +1019,14 @@ public class PurpurWorldConfig {