Sidestreams & Upstream update

PATCHES.md

@@ -46,7 +46,6 @@ # Patches
 | api |  Default permissions      | William Blake Galbreath |  |
 | server |  Disable the Snooper      | Sotr |  |
 | server |  Don't load chunk with seed based feature search      | Phoenix616 |  |
-| server |  Don't obfuscate air      | Ivan Pekov |  |
 | server |  Don't trigger Lootable Refresh for non player interaction      | Aikar |  |
 | server |  Don't wake up entities when damage event is cancelled      | Phoenix616 |  |
 | server |  Dont send useless entity packets      | William Blake Galbreath |  |

Purpur

@@ -1 +1 @@
-Subproject commit 7b70491991455dafa9dc45a0d8bbf5c36159fe5c
+Subproject commit 630ac49e6551aa9c05eada7f483a3b7d5a2576bb

Rainforest

@@ -1 +1 @@
-Subproject commit 7c29e7c3889ea3933f4bd4b13420b45fefabb0de
+Subproject commit 32a65fe276d0ca98d8050d608d9edcf42a4b3bce

Tuinity

@@ -1 +1 @@
-Subproject commit c1002c5d9d00e5d1107a0691a696258b607b3947
+Subproject commit 9eed723fb20914beef5212ade4106595240c18da

patches/server/0001-Yatopia-Server-Fixes.patch

@@ -735,7 +735,7 @@ index 8347faf8a7ee62d27cf5eb9f285695fddadfa624..00000000000000000000000000000000
 - 
 -             AttributeDefaults.a();
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c5c2239336b1d796f2b4ceb1f7ed31d694d0a2a7..fef1fd608a48db1350e211d0c1b883be6c32ac08 100644
+index 7f929a320bca835669b9267cdc52285ea767f2c1..af6040f2f5823ed9997ded08faf8e865f0a35031 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -1621,7 +1621,7 @@ index d1016d22fbb2dd15042fd6ccdf2ee7848351e518..00000000000000000000000000000000
 - 
 -         entitypigzombie.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0));
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3e080a10abc6674a542590cc9c109745b168ff24..7b0fdfe26de843eec0d8a80255218adc1abe56e3 100644
+index 5e4eb269bc849ee6b8dc8603a4f90639822b8bee..2b7dcf88e2feba50e5ae306ab3e746cd8b60ef02 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -135,7 +135,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1670,18 +1670,6 @@ index 3e080a10abc6674a542590cc9c109745b168ff24..7b0fdfe26de843eec0d8a80255218adc
                  this.triggerDimensionAdvancements(worldserver1);
                  this.playerInteractManager.a(worldserver);
                  this.playerConnection.sendPacket(new PacketPlayOutAbilities(this.abilities));
-@@ -1861,8 +1862,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     }
- 
-     public AdvancementDataPlayer getAdvancementDataIfLoadedImmediately() {
--        if (this.advancementDataPlayer == null && this.advancementDataPlayerCompletableFuture.isDone())
-+        if (this.advancementDataPlayer == null && this.advancementDataPlayerCompletableFuture.isDone()) {
-             this.advancementDataPlayer = this.advancementDataPlayerCompletableFuture.join();
-+            this.advancementDataPlayer.setPlayer(this);
-+        }
-         return this.advancementDataPlayer;
-     }
- 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java.rej b/src/main/java/net/minecraft/server/EntityPlayer.java.rej
 deleted file mode 100644
 index 96d58c9dcfcd1715b5d970054710e51e678cc188..0000000000000000000000000000000000000000
@@ -2289,7 +2277,7 @@ index 759862aba781ec6f1ae0c9a76c4ab6352d603a4c..00000000000000000000000000000000
 - 
 -                 if (chunkHolder.protoChunk != null) {try (Timing ignored2 = this.world.timings.chunkLoadLevelTimer.startTimingIfSync()) { // Paper start - timings // Paper - chunk is created async
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0b574089783b1491ba8cbe4058efae32e286fa27..d8a74f6dac01b47990901ad72f278716aaf1c292 100644
+index 0b574089783b1491ba8cbe4058efae32e286fa27..9bbb1bcf3e715b1fb50954e62b1faa139384c59f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -189,7 +189,7 @@ public abstract class PlayerList {
@@ -2301,18 +2289,6 @@ index 0b574089783b1491ba8cbe4058efae32e286fa27..d8a74f6dac01b47990901ad72f278716
          playerconnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
          playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.abilities));
          playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
-@@ -1338,11 +1338,6 @@ public abstract class PlayerList {
- 
-     // Paper start - async advancements
-     public CompletableFuture<AdvancementDataPlayer> loadAdvancementDataPlayerAsync(EntityPlayer entityPlayer) {
--        if (entityPlayer.getAdvancementDataIfLoadedImmediately() != null) {
--            entityPlayer.getAdvancementData().setPlayer(entityPlayer);
--            return CompletableFuture.completedFuture(entityPlayer.getAdvancementData());
--        }
--
-         UUID uuid = entityPlayer.getUniqueID();
-         File file = this.server.a(SavedFile.ADVANCEMENTS).toFile();
-         final File file1 = new File(file, uuid + ".json");
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java.rej b/src/main/java/net/minecraft/server/PlayerList.java.rej
 deleted file mode 100644
 index 7c9d7ae5f875ba36b13d6b9b76581be0df903b49..0000000000000000000000000000000000000000
@@ -3225,7 +3201,7 @@ index a3c8dfd94f78b49341e5f5aba1735651096c9d70..00000000000000000000000000000000
 -         public void restart() {
 -             org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 25f12589ccf3458576b8653a637b6f83eb633630..63cbecc4cdd549247b58fd094c27683655667799 100644
+index b2e2fcad2637e73cd69e14ac186c37c628da2761..132ad379242d9aa2defc639f79764050b73c572d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -154,6 +154,21 @@ public class Main {

patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch

@@ -405,7 +405,7 @@ index a60634fc455e8a59399020689b70eb64b6824d12..cb4a89940cf02de5c3eefc5c746397a9
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
          this.setResourcePack(dedicatedserverproperties.resourcePack, this.aZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fef1fd608a48db1350e211d0c1b883be6c32ac08..d71e9b542d323e4443f5cbd6869cc31d1bab3e5f 100644
+index af6040f2f5823ed9997ded08faf8e865f0a35031..d04d74f446d2632938a87cbd63e455683b3a8f37 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1035,7 +1035,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -464,7 +464,7 @@ index 7feb7933d56af0e58605c6eecb4ffb723ec8df0d..ea10950bfa54966d93f578a692388d8c
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 63cbecc4cdd549247b58fd094c27683655667799..afbcaee4177323da039793bc27869085c632c76a 100644
+index 132ad379242d9aa2defc639f79764050b73c572d..5387a50e4a24e2eb49693368c5342a69b8d14b69 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -169,6 +169,14 @@ public class Main {

patches/server/0010-Player-saving-async-FileIO.patch

@@ -77,7 +77,7 @@ index ce4ebc96c01f3dacf4e4d0569d86f52140440d43..a52c0391b171c8a57de75f87c534ce1e
              nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft());
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d8a74f6dac01b47990901ad72f278716aaf1c292..901ff462b2d14c73545772992483d242f4dfe9b6 100644
+index 9bbb1bcf3e715b1fb50954e62b1faa139384c59f..77eb467dfc4d2f02d2ca1db3691addbd347d9d61 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1284,6 +1284,28 @@ public abstract class PlayerList {

patches/server/0024-Redirect-Configs.patch

@@ -79,7 +79,7 @@ index cb4a89940cf02de5c3eefc5c746397a931c96b7a..7e053bc9bbd8abc1a6c060c1b4166ff2
          this.setPVP(dedicatedserverproperties.pvp);
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index afbcaee4177323da039793bc27869085c632c76a..3b3115716724c6ee8d70f840979c9ad4a3ea0259 100644
+index 5387a50e4a24e2eb49693368c5342a69b8d14b69..6dd3a0e1dde1a114374f52e903d10e973b4ca44f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -310,7 +310,7 @@ public class Main {

patches/server/0028-Fix-lead-fall-dmg-config.patch

@@ -19,7 +19,7 @@ index 39477fcec9ea1e09b9019534f09fe3ff03bdc886..0543de8ea80322028729723fd2b500ee
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d71e9b542d323e4443f5cbd6869cc31d1bab3e5f..199c92993890346d846a7f0e0fab545092211105 100644
+index d04d74f446d2632938a87cbd63e455683b3a8f37..03849c7709a5ea4852b23e828030dad2220523d3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1266,6 +1266,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0036-Don-t-obfuscate-air.patch

@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ivan Pekov <ivan@mrivanplays.com>
-Date: Tue, 18 Aug 2020 07:55:21 +0300
-Subject: [PATCH] Don't obfuscate air
-
-Thanks stonar96
-
-diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-index 5a69dde15f88ac051d25eaec4e07d1b030319c48..4f9bebb666fd3b31ee7c1c52666f34ede0fe42ec 100644
---- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-+++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-@@ -82,7 +82,7 @@ public final class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockCo
-         for (String id : toObfuscate) {
-             Block block = IRegistry.BLOCK.getOptional(new MinecraftKey(id)).orElse(null);
- 
--            if (block != null) {
-+            if (block != null && !block.getBlockData().isAir()) { // Yatopia - don't obfuscate air - causes unnecessary block updates to fail in the void
-                 obfuscateGlobal[ChunkSection.GLOBAL_PALETTE.getOrCreateIdFor(block.getBlockData())] = true;
-             }
-         }