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

Updated Upstream (Paper)

Browse Source 
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:
William Blake Galbreath
2020-10-17 01:47:48 -05:00
parent a8a4826743
commit afed247113
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 50cbb24ce8...fabf213e91

2
current-paper
View File

@@ -1 +1 @@
1.16.3--0a16faae43527ad2f2f051f3c9c4d28baac2a423 1.16.3--3aebf776907035ee3a8ece5129c13f2e0d0bd1e1

6
patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
View File

@@ -11,10 +11,10 @@ in IWorldServerData are removed as they were only used in certain places, with h
values used in other places. 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 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 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/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."); 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 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 --- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java
+++ b/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 { @@ -9,49 +9,58 @@ public class MobSpawnerTrader implements MobSpawner {