Update upstream

FroobWorld · Jul 20, 2024 · f6f0a2d · f6f0a2d
1 parent eff8f5a
commit f6f0a2d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=com.froobworld.nabulus
 version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
-paperRef=2288e13816a74d96f3acbbb3c369b9ec87c8df76
+paperRef=f1f01a1622625cd995420f3971e41422302b9cd9
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0002-Separate-creative-levels.patch b/patches/server/0002-Separate-creative-levels.patch
@@ -17,26 +17,26 @@ 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 9d1e68c09fa7093cf0f6fa636f90cb15a44cbb38..3b2d9d23b2432df0e74668e32a37e3b3ae0f0468 100644
+index 5980b70e2d7273239245237189b2debcbccfbac3..8608103860ac56b52f73f460eaa57a9d8a62296f 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
+@@ -697,6 +697,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
              this.setPosRaw(position.x(), position.y(), position.z()); // Paper - don't register to chunks yet
          }
          this.gameMode.setLevel((ServerLevel) world);
 +        this.chooseInventory(); // Nabulus
      }
      // CraftBukkit end
 
-@@ -1404,6 +1405,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1403,6 +1404,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);
-@@ -2033,12 +2035,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2032,12 +2034,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      }
 
      public void restoreFrom(ServerPlayer oldPlayer, boolean alive) {
@@ -59,7 +59,7 @@ index 9d1e68c09fa7093cf0f6fa636f90cb15a44cbb38..3b2d9d23b2432df0e74668e32a37e3b3
          if (alive) {
              this.getInventory().replaceWith(oldPlayer.getInventory());
              this.setHealth(oldPlayer.getHealth());
-@@ -2074,6 +2086,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2073,6 +2085,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,10 +68,10 @@ index 9d1e68c09fa7093cf0f6fa636f90cb15a44cbb38..3b2d9d23b2432df0e74668e32a37e3b3
          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 5f20606cc2c79ad9a4c4d4d6c9e6a2a31a88b282..6f834c3a176ab39c7e740aa060261c373242a803 100644
+index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..3ae3ba6a0f048cdfe870e1ea2d1ee6792e24ba38 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 {
+@@ -819,9 +819,27 @@ public abstract class PlayerList {
          Level fromWorld = entityplayer.level();
          entityplayer.wonGame = false;
          // CraftBukkit end
@@ -100,7 +100,7 @@ index 5f20606cc2c79ad9a4c4d4d6c9e6a2a31a88b282..6f834c3a176ab39c7e740aa060261c37
          entityplayer1.setId(entityplayer.getId());
          entityplayer1.setMainArm(entityplayer.getMainArm());
          // CraftBukkit - not required, just copies old location into reused entity
-@@ -840,10 +858,12 @@ public abstract class PlayerList {
+@@ -841,10 +859,12 @@ public abstract class PlayerList {
          }
          // Paper start - Add PlayerPostRespawnEvent
          boolean isBedSpawn = false;
@@ -114,7 +114,7 @@ index 5f20606cc2c79ad9a4c4d4d6c9e6a2a31a88b282..6f834c3a176ab39c7e740aa060261c37
          DimensionTransition dimensiontransition;
          if (location == null) {
              dimensiontransition = entityplayer.findRespawnPositionAndUseSpawnBlock(flag, DimensionTransition.DO_NOTHING, reason);
-@@ -853,6 +873,8 @@ public abstract class PlayerList {
+@@ -854,6 +874,8 @@ public abstract class PlayerList {
          } else {
              dimensiontransition = new DimensionTransition(((CraftWorld) location.getWorld()).getHandle(), CraftLocation.toVec3D(location), Vec3.ZERO, location.getYaw(), location.getPitch(), DimensionTransition.DO_NOTHING);
          }
@@ -124,7 +124,7 @@ index 5f20606cc2c79ad9a4c4d4d6c9e6a2a31a88b282..6f834c3a176ab39c7e740aa060261c37
          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 be9976a994dd04cf53048567576dd3484facf625..763f106fdecdfe034800f5b4ddfee983d34afddc 100644
+index 1f7594e22f0f08ae110ef9b42f15119358aa5723..0c65c46a6b0ee1ef71a13f715294385a20b0be27 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3722,6 +3722,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/patches/server/0003-Show-hidden-players-in-playerlist-and-tab-suggestion.patch b/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 6f834c3a176ab39c7e740aa060261c373242a803..2d8aa58ed116fcc66852a23fa2fbab7204208074 100644
+index 3ae3ba6a0f048cdfe870e1ea2d1ee6792e24ba38..d7bcbc460a53490cbfca2c695bdad244f5e1f8e0 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 {
@@ -39,15 +39,15 @@ index 6f834c3a176ab39c7e740aa060261c373242a803..2d8aa58ed116fcc66852a23fa2fbab72
              }
 
              onlinePlayers.add(entityplayer1); // Paper - Use single player info update packet on join
-@@ -673,6 +673,7 @@ public abstract class PlayerList {
+@@ -674,6 +674,7 @@ public abstract class PlayerList {
              if (entityplayer2.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
                  entityplayer2.connection.send(packet);
              } else {
 +                entityplayer2.connection.send(packet); // Nabulus
                  entityplayer2.getBukkitEntity().onEntityRemove(entityplayer);
              }
          }
-@@ -998,7 +999,7 @@ public abstract class PlayerList {
+@@ -999,7 +1000,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) {
@@ -57,10 +57,10 @@ index 6f834c3a176ab39c7e740aa060261c373242a803..2d8aa58ed116fcc66852a23fa2fbab72
                  }).collect(Collectors.toList())));
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index caf6ff33b42472d30f28629470e12889f50490cc..b5107e81982becff0573c975851e8def3fee2a86 100644
+index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..6a1c5fa7a850394eef206b576313be1aec80a2d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2585,7 +2585,7 @@ public final class CraftServer implements Server {
+@@ -2594,7 +2594,7 @@ public final class CraftServer implements Server {
          PlayerChatTabCompleteEvent event = new PlayerChatTabCompleteEvent(player, message, completions);
          String token = event.getLastToken();
          for (Player p : this.getOnlinePlayers()) {
@@ -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 d01b45a48d412e3cb591acee101730704574448a..ebd76c97f891e96e5899c9f02a3f49ae3864177e 100644
+index 992437a6e838f653f32d33b5b3f702c484640a97..6e4e47cc7e428038736468bbe9df955627565b30 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 {