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: fabf213e [Auto] Updated Upstream (Bukkit) efd90b1e Anti Xray: Obfuscate blocks touching lava feature (#3311)
This commit is contained in:
@@ -11,10 +11,10 @@ in IWorldServerData are removed as they were only used in certain places, with h
|
||||
values used in other places.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index b0fcf76047..3bc0731243 100644
|
||||
index 499f8aa21..7927da524 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -670,4 +670,17 @@ public class PaperWorldConfig {
|
||||
@@ -672,4 +672,17 @@ public class PaperWorldConfig {
|
||||
log("Using vanilla redstone algorithm.");
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,7 @@ index b0fcf76047..3bc0731243 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
|
||||
index f88c7b5480..e47315cd47 100644
|
||||
index f88c7b548..e47315cd4 100644
|
||||
--- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java
|
||||
+++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
|
||||
@@ -9,49 +9,58 @@ public class MobSpawnerTrader implements MobSpawner {
|
||||
|
||||
Reference in New Issue
Block a user