From afed2471137ce5ebd5a75f5b072ce4b1d7639a92 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 17 Oct 2020 01:47:48 -0500
Subject: [PATCH] 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)
---
 Paper                                                       | 2 +-
 current-paper                                               | 2 +-
 ...127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Paper b/Paper
index 50cbb24ce..fabf213e9 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 50cbb24ce8347dbc11fdc3de15cd5f1cd41e4476
+Subproject commit fabf213e918df07d3f62917a03f3514e36a9dd3d
diff --git a/current-paper b/current-paper
index 6d091b15e..c45d57218 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.3--0a16faae43527ad2f2f051f3c9c4d28baac2a423
+1.16.3--3aebf776907035ee3a8ece5129c13f2e0d0bd1e1
diff --git a/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch b/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
index 382c80e64..cd736828f 100644
--- a/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
+++ b/patches/server/0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch
@@ -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 {