[WIP|1.16] Misc fixes (#3627)

SHIT_TO_CHECK.md

@@ -1,9 +1,8 @@
 # Shit to check
 
-* Mini: "Allow disabling armour stand ticking": Not sure if the equipment update actually works, vanilla shifted a bunch of shit
 * Mini: "Optimize World Server Map": Figure out how to fill PaperWorldMap, it needs a dim key which doesnt exist anymore?
 * Mini: "MC-50319": fix if still works
-* Mini: I definetly dropped a patch I didnt want to drop, we need to go thru in the end and see if all patches are still in, lol
 * Make sure the flat bedrock setting doesn't do anything stupid
 * Check DataBits foreach
-* Update MobGoalHelper
+* lighting is bork (load chunk, fly away, come back, everything or parts are black)
+* block actions (particles/sounds) are bork (no chest opening, no bell, no noteblock)

Spigot-Server-Patches/Add-Plugin-Tickets-to-API-Chunk-Methods.patch

@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          loadIcon();
      }
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         waterAnimalSpawn = configuration.getInt("spawn-limits.water-animals");
+         waterAmbientSpawn = configuration.getInt("spawn-limits.water-ambient");
          ambientSpawn = configuration.getInt("spawn-limits.ambient");
          warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));
 -        TicketType.PLUGIN.loadPeriod = configuration.getInt("chunk-gc.period-in-ticks");

Spigot-Server-Patches/Entity-Activation-Range-2.0.patch

@@ -322,8 +322,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
-     public long ticksPerMonsterSpawns;
      public long ticksPerWaterSpawns;
+     public long ticksPerWaterAmbientSpawns;
      public long ticksPerAmbientSpawns;
 +    // Paper start
 +    public int wakeupInactiveRemainingAnimals;

Spigot-Server-Patches/FIX-DIS-SHIT.patch

@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MiniDigger | Martin <admin@minidigger.dev>
+Date: Fri, 26 Jun 2020 16:51:44 +0200
+Subject: [PATCH] FIX DIS SHIT
+
+
+diff --git a/src/main/java/net/minecraft/server/SensorHoglinSpecific.java b/src/main/java/net/minecraft/server/SensorHoglinSpecific.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/SensorHoglinSpecific.java
++++ b/src/main/java/net/minecraft/server/SensorHoglinSpecific.java
+@@ -0,0 +0,0 @@ public class SensorHoglinSpecific extends Sensor<EntityHoglin> {
+     protected void a(WorldServer worldserver, EntityHoglin entityhoglin) {
+         BehaviorController<?> behaviorcontroller = entityhoglin.getBehaviorController();
+ 
+-        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_REPELLENT, this.b(worldserver, entityhoglin));
++        // behaviorcontroller.setMemory(MemoryModuleType.NEAREST_REPELLENT, this.bb(worldserver, entityhoglin)); // Paper - fix dis shit (for now) + rename
+         Optional<EntityPiglin> optional = Optional.empty();
+         int i = 0;
+         List<EntityHoglin> list = Lists.newArrayList();
+@@ -0,0 +0,0 @@ public class SensorHoglinSpecific extends Sensor<EntityHoglin> {
+         }
+ 
+         behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, optional);
+-        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS, (Object) list);
+-        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, (Object) i);
+-        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, (Object) list.size());
++        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS, list); // Paper - decomp fix
++        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, i); // Paper - decomp fix
++        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, list.size()); // Paper - decomp fix
+     }
+ 
+-    private Optional<BlockPosition> b(WorldServer worldserver, EntityHoglin entityhoglin) {
++    private Optional<BlockPosition> bb(WorldServer worldserver, EntityHoglin entityhoglin) { // Paper - rename
+         return BlockPosition.a(entityhoglin.getChunkCoordinates(), 8, 4, (blockposition) -> {
+             return worldserver.getType(blockposition).a((Tag) TagsBlock.HOGLIN_REPELLENTS);
+         });
+diff --git a/src/main/java/net/minecraft/server/SensorPiglinSpecific.java b/src/main/java/net/minecraft/server/SensorPiglinSpecific.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/SensorPiglinSpecific.java
++++ b/src/main/java/net/minecraft/server/SensorPiglinSpecific.java
+@@ -0,0 +0,0 @@ public class SensorPiglinSpecific extends Sensor<EntityLiving> {
+     protected void a(WorldServer worldserver, EntityLiving entityliving) {
+         BehaviorController<?> behaviorcontroller = entityliving.getBehaviorController();
+ 
+-        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_REPELLENT, c(worldserver, entityliving));
++//        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_REPELLENT, c(worldserver, entityliving)); // Paper - fix dis shit (for now)
+         Optional<EntityInsentient> optional = Optional.empty();
+         Optional<EntityHoglin> optional1 = Optional.empty();
+         Optional<EntityHoglin> optional2 = Optional.empty();
+@@ -0,0 +0,0 @@ public class SensorPiglinSpecific extends Sensor<EntityLiving> {
+         behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_ZOMBIFIED, optional4);
+         behaviorcontroller.setMemory(MemoryModuleType.NEAREST_TARGETABLE_PLAYER_NOT_WEARING_GOLD, optional5);
+         behaviorcontroller.setMemory(MemoryModuleType.NEAREST_PLAYER_HOLDING_WANTED_ITEM, optional6);
+-        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_ADULT_PIGLINS, (Object) list1);
+-        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS, (Object) list);
+-        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, (Object) list.size());
+-        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, (Object) i);
++        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_ADULT_PIGLINS, list1); // Paper - decomp fix
++        behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLINS, list); // Paper - decomp fix
++        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, list.size()); // Paper - decomp fix
++        behaviorcontroller.setMemory(MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, i); // Paper - decomp fix
+     }
+ 
+     private static Optional<BlockPosition> c(WorldServer worldserver, EntityLiving entityliving) {

Spigot-Server-Patches/Further-improve-server-tick-loop.patch

@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static int currentTick = 0; // Paper - Further improve tick loop
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
-     public File bukkitDataPackFolder;
+     public CommandDispatcher vanillaCommandDispatcher;
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      // Spigot start
      public static final int TPS = 20;

Spigot-Server-Patches/Improved-Watchdog-Support.patch

@@ -113,8 +113,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+     public int autosavePeriod;
      public boolean serverAutoSave = false; // Paper
-     public File bukkitDataPackFolder;
      public CommandDispatcher vanillaCommandDispatcher;
 -    private boolean forceTicks;
 +    public boolean forceTicks; // Paper

Spigot-Server-Patches/MC-Dev-fixes.patch

@@ -193,6 +193,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
              return this.getTemperature() - (f + (float) blockposition.getY() - 64.0F) * 0.05F / 30.0F;
          } else {
+diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
++++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
+@@ -0,0 +0,0 @@ public class BiomeFrozenDeepOcean extends BiomeBase {
+         }
+ 
+         if (blockposition.getY() > 64) {
+-            float f1 = (float) (BiomeFrozenDeepOcean.e.a((double) ((float) blockposition.getX() / 8.0F), (double) ((float) blockposition.getZ() / 8.0F), false) * 4.0D);
++            float f1 = (float) (BiomeFrozenDeepOcean.NOISE_GENERATOR_3.a((double) ((float) blockposition.getX() / 8.0F), (double) ((float) blockposition.getZ() / 8.0F), false) * 4.0D); // Paper - rename
+ 
+             return f - (f1 + (float) blockposition.getY() - 64.0F) * 0.05F / 30.0F;
+         } else {
+diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
++++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
+@@ -0,0 +0,0 @@ public final class BiomeFrozenOcean extends BiomeBase {
+         }
+ 
+         if (blockposition.getY() > 64) {
+-            float f1 = (float) (BiomeFrozenOcean.e.a((double) ((float) blockposition.getX() / 8.0F), (double) ((float) blockposition.getZ() / 8.0F), false) * 4.0D);
++            float f1 = (float) (BiomeFrozenOcean.NOISE_GENERATOR_3.a((double) ((float) blockposition.getX() / 8.0F), (double) ((float) blockposition.getZ() / 8.0F), false) * 4.0D);  // Paper - rename
+ 
+             return f - (f1 + (float) blockposition.getY() - 64.0F) * 0.05F / 30.0F;
+         } else {
 diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/Biomes.java

Spigot-Server-Patches/Provide-E-TE-Chunk-count-stat-methods.patch

@@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
-     private int waterAnimalSpawn = -1;
+     private int waterAmbientSpawn = -1;
      private int ambientSpawn = -1;
  
 +    // Paper start - Provide fast information methods

Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch

@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              Entity entity1 = this.getShooter();
 -
 +            // Paper start - Cancel hit for vanished players
-+            if (entity1 instanceof EntityPlayer) {
++            if (entity1 instanceof EntityPlayer && entity instanceof EntityPlayer) {
 +                org.bukkit.entity.Player collided = (org.bukkit.entity.Player) entity.getBukkitEntity();
 +                org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) entity1.getBukkitEntity();
 +                if (!shooter.canSee(collided)) return false;

Spigot-Server-Patches/incremental-chunk-saving.patch

@@ -70,9 +70,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
 +    public boolean serverAutoSave = false; // Paper
-     public File bukkitDataPackFolder;
      public CommandDispatcher vanillaCommandDispatcher;
      private boolean forceTicks;
+     // CraftBukkit end
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.serverPing.b().a(agameprofile);
          }

work/Bukkit

@@ -1 +1 @@
-Subproject commit 8edeffe67d1821afd48d16cd0ec2572251f24ee8
+Subproject commit edc7a378c9258ef533f90de135e250ca91b1ae02

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit d1fb662ec53c4fd8bc718039b76a3e9a11346371
+Subproject commit 4ff609e60c191f107682681b5e3a8262f8a4c844

work/Spigot

@@ -1 +1 @@
-Subproject commit 8fc58f10ab171ca1979afa2065909214a0ffab32
+Subproject commit 16d78990fe27633e0ec129216f96d3b50f770025