Update upstream

Author: froobynooby

gradle.properties

@@ -2,7 +2,7 @@ group=com.froobworld.nabulus
 version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
-paperRef=b4b820851f5291c467b1a9590750a10ec67af4f6
+paperRef=2288e13816a74d96f3acbbb3c369b9ec87c8df76
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0002-Separate-creative-levels.patch

@@ -17,7 +17,7 @@ index c1510d9167f466d3b7e3756353224f12f3876442..d4f0561741e71e10bf08448a02373207
              WalkerUtils.convert(MCTypeRegistry.ENTITY, data, "ShoulderEntityLeft", fromVersion, toVersion);
              WalkerUtils.convert(MCTypeRegistry.ENTITY, data, "ShoulderEntityRight", fromVersion, toVersion);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..4e96d257ea1f3fb310bfcfbf5d28ca4ed2133f0f 100644
+index 9d1e68c09fa7093cf0f6fa636f90cb15a44cbb38..3b2d9d23b2432df0e74668e32a37e3b3ae0f0468 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -698,6 +698,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -28,15 +28,15 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..4e96d257ea1f3fb310bfcfbf5d28ca4e
      }
      // CraftBukkit end
 
-@@ -1402,6 +1403,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1404,6 +1405,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                  this.unsetRemoved();
                  // CraftBukkit end
                  this.setServerLevel(worldserver);
 +                this.chooseInventory(); // Nabulus
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
                  worldserver.addDuringTeleport(this);
-@@ -2031,12 +2033,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2033,12 +2035,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      }
 
      public void restoreFrom(ServerPlayer oldPlayer, boolean alive) {
@@ -50,7 +50,7 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..4e96d257ea1f3fb310bfcfbf5d28ca4e
          this.gameMode.setGameModeForPlayer(oldPlayer.gameMode.getGameModeForPlayer(), oldPlayer.gameMode.getPreviousGameModeForPlayer());
          this.onUpdateAbilities();
          this.getAttributes().assignBaseValues(oldPlayer.getAttributes());
-         this.setHealth(this.getMaxHealth());
+         // this.setHealth(this.getMaxHealth()); // CraftBukkit
 +        // Nabulus start
 +        this.normalInventory.replaceWith(oldPlayer.normalInventory);
 +        this.creativeLevelInventory.replaceWith(oldPlayer.creativeLevelInventory);
@@ -59,7 +59,7 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..4e96d257ea1f3fb310bfcfbf5d28ca4e
          if (alive) {
              this.getInventory().replaceWith(oldPlayer.getInventory());
              this.setHealth(oldPlayer.getHealth());
-@@ -2072,6 +2084,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2074,6 +2086,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          this.seenCredits = oldPlayer.seenCredits;
          this.enteredNetherPosition = oldPlayer.enteredNetherPosition;
          this.chunkTrackingView = oldPlayer.chunkTrackingView;
@@ -68,7 +68,7 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..4e96d257ea1f3fb310bfcfbf5d28ca4e
          this.setShoulderEntityRight(oldPlayer.getShoulderEntityRight());
          this.setLastDeathLocation(oldPlayer.getLastDeathLocation());
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ef177f21d654d69c128f3f39ea58f2d8ee598628..7d72decf7ce0459951c5f636e53c50c2dc7d8865 100644
+index 5f20606cc2c79ad9a4c4d4d6c9e6a2a31a88b282..6f834c3a176ab39c7e740aa060261c373242a803 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -818,9 +818,27 @@ public abstract class PlayerList {
@@ -124,10 +124,10 @@ index ef177f21d654d69c128f3f39ea58f2d8ee598628..7d72decf7ce0459951c5f636e53c50c2
          if (dimensiontransition == null) {
              return entityplayer;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 437956b18d5bffd93c46e0be34cf413e9c704e5a..716bd7e978033cde66e5375ddbae9e0a019f4e61 100644
+index be9976a994dd04cf53048567576dd3484facf625..763f106fdecdfe034800f5b4ddfee983d34afddc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3562,6 +3562,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3722,6 +3722,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          // Paper end - Fix item duplication and teleport issues
          if (world instanceof ServerLevel worldserver) {
              if (!this.isRemoved()) {
@@ -156,10 +156,10 @@ index 45761c113116ae7417e6ae99069bff35dbccdf30..3dd19ef284dcab420dfc56c100ccf1df
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0526f4c701b4d945f26c5f382e9efac86cc568fa..7fa5754e0cce68f2ca17be81075cb76584eab5f9 100644
+index 09bcbc0ae36e4e69fee87a7e0c49acf496117a39..591797efe64ca85da29fb876d00cf7fa8dd84ecc 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -201,6 +201,40 @@ public abstract class Player extends LivingEntity {
+@@ -202,6 +202,40 @@ public abstract class Player extends LivingEntity {
      public boolean fauxSleeping;
      public int oldLevel = -1;
 
@@ -200,15 +200,15 @@ index 0526f4c701b4d945f26c5f382e9efac86cc568fa..7fa5754e0cce68f2ca17be81075cb765
      @Override
      public CraftHumanEntity getBukkitEntity() {
          return (CraftHumanEntity) super.getBukkitEntity();
-@@ -214,6 +248,7 @@ public abstract class Player extends LivingEntity {
+@@ -215,6 +249,7 @@ public abstract class Player extends LivingEntity {
          this.lastDeathLocation = Optional.empty();
          this.setUUID(gameProfile.getId());
          this.gameProfile = gameProfile;
 +        this.chooseInventory(); // Nabulus
          this.inventoryMenu = new InventoryMenu(this.inventory, !world.isClientSide, this);
          this.containerMenu = this.inventoryMenu;
          this.moveTo((double) pos.getX() + 0.5D, (double) (pos.getY() + 1), (double) pos.getZ() + 0.5D, yaw, 0.0F);
-@@ -876,6 +911,15 @@ public abstract class Player extends LivingEntity {
+@@ -877,6 +912,15 @@ public abstract class Player extends LivingEntity {
 
          this.inventory.load(nbttaglist);
          this.inventory.selected = nbt.getInt("SelectedItemSlot");
@@ -224,7 +224,7 @@ index 0526f4c701b4d945f26c5f382e9efac86cc568fa..7fa5754e0cce68f2ca17be81075cb765
          this.sleepCounter = nbt.getShort("SleepTimer");
          this.experienceProgress = nbt.getFloat("XpP");
          this.experienceLevel = nbt.getInt("XpLevel");
-@@ -927,8 +971,12 @@ public abstract class Player extends LivingEntity {
+@@ -928,8 +972,12 @@ public abstract class Player extends LivingEntity {
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
          NbtUtils.addCurrentDataVersion(nbt);

patches/server/0003-Show-hidden-players-in-playerlist-and-tab-suggestion.patch

@@ -18,7 +18,7 @@ index 73180c617945610e11b777733655f9e2c4c1dd0c..aec6ec9bc92dc784ea1c2907b051a3f9
          List<ServerPlayer> list = players;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7d72decf7ce0459951c5f636e53c50c2dc7d8865..9ddf39448987464987418eb08aad31aceddd755f 100644
+index 6f834c3a176ab39c7e740aa060261c373242a803..2d8aa58ed116fcc66852a23fa2fbab7204208074 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -365,7 +365,7 @@ public abstract class PlayerList {
@@ -47,7 +47,7 @@ index 7d72decf7ce0459951c5f636e53c50c2dc7d8865..9ddf39448987464987418eb08aad31ac
                  entityplayer2.getBukkitEntity().onEntityRemove(entityplayer);
              }
          }
-@@ -997,7 +998,7 @@ public abstract class PlayerList {
+@@ -998,7 +999,7 @@ public abstract class PlayerList {
                  target.connection.send(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY), this.players.stream().filter(new Predicate<ServerPlayer>() {
                      @Override
                      public boolean test(ServerPlayer input) {
@@ -70,7 +70,7 @@ index caf6ff33b42472d30f28629470e12889f50490cc..b5107e81982becff0573c975851e8def
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7eea190ce8a62960ecc42ff56a4ef71b754184fb..5ed2bdefc885e781f4b68566da5bf505ee1373f5 100644
+index d01b45a48d412e3cb591acee101730704574448a..ebd76c97f891e96e5899c9f02a3f49ae3864177e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -551,7 +551,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -91,7 +91,7 @@ index 7eea190ce8a62960ecc42ff56a4ef71b754184fb..5ed2bdefc885e781f4b68566da5bf505
                  player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
              }
          }
-@@ -2052,11 +2052,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2053,11 +2053,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Remove this entity from the hidden player's EntityTrackerEntry
          // Paper start
          Entity other = ((CraftEntity) entity).getHandle();
@@ -109,7 +109,7 @@ index 7eea190ce8a62960ecc42ff56a4ef71b754184fb..5ed2bdefc885e781f4b68566da5bf505
          // Paper end
          ChunkMap tracker = ((ServerLevel) this.getHandle().level()).getChunkSource().chunkMap;
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
-@@ -2065,7 +2070,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2066,7 +2071,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
 
          // Remove the hidden entity from this player user list, if they're on it

patches/server/0005-Add-silent-chest-flag-to-players.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add silent chest flag to players
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 7fa5754e0cce68f2ca17be81075cb76584eab5f9..d1c4e6e41b29ec07626788375baac168ca8672d5 100644
+index 591797efe64ca85da29fb876d00cf7fa8dd84ecc..d6cf805d09856c30b62620e29ce1798543979de6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -202,6 +202,7 @@ public abstract class Player extends LivingEntity {
+@@ -203,6 +203,7 @@ public abstract class Player extends LivingEntity {
      public int oldLevel = -1;
 
      // Nabulus start