Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@eb48ada Merge chunk task urgent executor thread into the worker queue
PaperMC/Paper@d9fb602 Expose vanilla BiomeProvider from WorldInfo (#7295)
PaperMC/Paper@7d7ae7b Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7246)
This commit is contained in:
BillyGalbreath
2022-01-09 00:27:01 -06:00
parent 9c51f21c2e
commit e85e5ebc2e
22 changed files with 84 additions and 88 deletions

View File

@@ -25,7 +25,7 @@ index b5d48e3979361e1b6407a1dcf0f5271542273974..71eef6cc623db385db98d3fe98ea6574
public boolean spiderRidable = false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index e12ba58f3795c17694defa308ced50a19d2a37b9..49b9c0db6693c95bae8f63e97f50720580dc59da 100644
index d3c84417596a56e38012f2d0cee4203a1b875ac2..b72234ede04005c8d2be1e339f5bcebd7790bb61 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;
@@ -36,7 +36,7 @@ index e12ba58f3795c17694defa308ced50a19d2a37b9..49b9c0db6693c95bae8f63e97f507205
import net.minecraft.world.entity.animal.WaterAnimal;
import net.minecraft.world.entity.animal.horse.Llama;
import net.minecraft.world.entity.boss.EnderDragonPart;
@@ -381,6 +382,7 @@ public class ActivationRange
@@ -385,6 +386,7 @@ public class ActivationRange
*/
public static boolean checkIfActive(Entity entity)
{