Update Upstream (Purpur)

2022-11-14 14:57:20 -05:00
parent ad2b22e087
commit 83ecd63f6a
6 changed files with 22 additions and 22 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = cc.keyimc.keyi
 version = 1.19.2-R0.1-SNAPSHOT

-purpurCommit = f72fd9b28bad085e2bffea9424c09d9be47f35b0
+purpurCommit = 1aa65909d796e3354afdaa95244ec914b3fccfd4

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/server/0004-Lithium-optimizations.patch
+++ b/patches/server/0004-Lithium-optimizations.patch
@@ -1276,7 +1276,7 @@ index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..6f181fc878a96b09f126ea8d3b19ce3e
     @Override
     public Iterator<T> iterator() {
 diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
-index 9b22034aa655ceb0da151d9d8ca3147f6487889a..ec587cf6592a1dc0d90d6f54af1bdfab97aec7c6 100644
+index 46e3e884890a23f5f90efc795a21566dd40804df..c852331f0c9dddbfe29e88e2dca1dceb2d7cee44 100644
 --- a/src/main/java/net/minecraft/util/Mth.java
 +++ b/src/main/java/net/minecraft/util/Mth.java
@@ -32,6 +32,7 @@ public class Mth {
@@ -1378,10 +1378,10 @@ index 5d8e9bdf5538b19681f21949368d862fab8a89ad..2224245a985dfe78565dfdb42840d3ed
 +    @Override public <T> void compact(Palette<T> srcPalette, Palette<T> dstPalette, short[] out) {} // JettPack
 }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 967647c7dc0a4c2d762e7133fe969106f7d8ecba..dbaece0cbf521aada6bda2a2266edf0e97f3055f 100644
+index 193b6621d6506a04bc1f9f23571aeb2e635d562c..6f2518ec1be9af4fa00d719c50cbe64e4e57fcbc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2589,39 +2589,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2590,39 +2590,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
         return !this.isRemoved();
     }
 
@@ -1513,7 +1513,7 @@ index 1ec9a48f2f44f5bd647e0661423ae90970aee262..219c7dcbe6bee5054aff0640a80d620e
 
         if (flag && !this.onGround && !this.isPassenger() && !this.hasEffect(MobEffects.LEVITATION)) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 00fc98797aea23e1f586b8e7f85fc27e2019352f..1094792600f30632b2aa79dd0025dac3e4937aa6 100644
+index 2c915c765ceef3ec28f5a58fa9a587282c1a906a..a3f42f8e9f31efce278481e115b1e2b683af078f 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
@@ -16,11 +16,13 @@ import net.minecraft.nbt.CompoundTag;
@@ -1630,7 +1630,7 @@ index 6a0a1731fd6804eb69d3641213712d31bce085b2..06110d58342d07cf454f1829140855ac
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 17e869074b8cf29a8c3280499a27e95179896750..97a5aec7da267b8b9f6d191c871316ccb89c448c 100644
+index 9fa0758c0a8c74dec6cfe8a16585ace1cf45df96..f912b0ec9f58861efcc4fbd65604bd0a31c6d7d5 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
@@ -27,6 +27,7 @@ import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@@ -1714,7 +1714,7 @@ index e94ca6283a0471a49b31942de763472ccb989dcb..9212786dd26a48999e7d7159a77f19b6
     }
 }
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index 7c59d44a3bafdc65f453d77ff3e25cffb742ad6c..636721a111cad13e7329f1157981ca03a8f339b3 100644
+index 4b61602a1d2d6817272e02cfd282ac5dabbd976d..57bd494395de37a34452e9c7d2899b249011651c 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
@@ -52,6 +52,74 @@ public class PistonMovingBlockEntity extends BlockEntity {
--- a/patches/server/0005-CarpetFixes-optimizations.patch
+++ b/patches/server/0005-CarpetFixes-optimizations.patch
@@ -183,7 +183,7 @@ index 88f10d729aa1e0a01790521821d691a0ecd373a2..45b2aa542969798a5a3b73af78de21cc
     // Paper end
 }
 diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
-index ec587cf6592a1dc0d90d6f54af1bdfab97aec7c6..0afd56a8b27fce044f7d43b1e4f86b617c0b827f 100644
+index c852331f0c9dddbfe29e88e2dca1dceb2d7cee44..67ca2a39236ecfaeb54294b8b6b9fdb109b54513 100644
 --- a/src/main/java/net/minecraft/util/Mth.java
 +++ b/src/main/java/net/minecraft/util/Mth.java
@@ -792,7 +792,7 @@ public class Mth {
@@ -356,7 +356,7 @@ index 954a12c23da96a07cd175f6f2eb28e8c5d2a8c3d..e5bef70e9a5abfec859757bc47b003d2
     private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) {
         CraftingContainer inventorycrafting = new CraftingContainer(new AbstractContainerMenu((MenuType) null, -1) {
 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 e87a436711e179a4384630de41188c09a75a7f0d..5668e6fa7f560199c352dbed629dbc6897d468a7 100644
+index 1b7e38538881ba00ffdbe9226952627151532c5c..ff57940690dd9a1f43dab16d5b26432210659cc4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1126,7 +1126,7 @@ public abstract class Player extends LivingEntity {
@@ -377,7 +377,7 @@ index e87a436711e179a4384630de41188c09a75a7f0d..5668e6fa7f560199c352dbed629dbc68
                 }
 
             }
-@@ -1462,7 +1462,7 @@ public abstract class Player extends LivingEntity {
+@@ -1471,7 +1471,7 @@ public abstract class Player extends LivingEntity {
                         if (target instanceof LivingEntity) {
                             float f5 = f3 - ((LivingEntity) target).getHealth();
 
@@ -386,7 +386,7 @@ index e87a436711e179a4384630de41188c09a75a7f0d..5668e6fa7f560199c352dbed629dbc68
                             if (j > 0) {
                                 // CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item
                                 EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), target.getBukkitEntity(), j * 4);
-@@ -1735,29 +1735,29 @@ public abstract class Player extends LivingEntity {
+@@ -1744,29 +1744,29 @@ public abstract class Player extends LivingEntity {
             int i;
 
             if (this.isSwimming()) {
@@ -421,7 +421,7 @@ index e87a436711e179a4384630de41188c09a75a7f0d..5668e6fa7f560199c352dbed629dbc68
                 if (i > 0) {
                     if (this.isSprinting()) {
                         this.awardStat(Stats.SPRINT_ONE_CM, i);
-@@ -1771,10 +1771,10 @@ public abstract class Player extends LivingEntity {
+@@ -1780,10 +1780,10 @@ public abstract class Player extends LivingEntity {
                     }
                 }
             } else if (this.isFallFlying()) {
@@ -434,7 +434,7 @@ index e87a436711e179a4384630de41188c09a75a7f0d..5668e6fa7f560199c352dbed629dbc68
                 if (i > 25) {
                     this.awardStat(Stats.FLY_ONE_CM, i);
                 }
-@@ -1785,7 +1785,7 @@ public abstract class Player extends LivingEntity {
+@@ -1794,7 +1794,7 @@ public abstract class Player extends LivingEntity {
 
     public void checkRidingStatistics(double dx, double dy, double dz) {
         if (this.isPassenger()) {
@@ -443,7 +443,7 @@ index e87a436711e179a4384630de41188c09a75a7f0d..5668e6fa7f560199c352dbed629dbc68
 
             if (i > 0) {
                 Entity entity = this.getVehicle();
-@@ -1812,7 +1812,7 @@ public abstract class Player extends LivingEntity {
+@@ -1821,7 +1821,7 @@ public abstract class Player extends LivingEntity {
             return false;
         } else {
             if (fallDistance >= 2.0F) {
--- a/patches/server/0006-Suki-Patches.patch
+++ b/patches/server/0006-Suki-Patches.patch
@@ -140,10 +140,10 @@ index 2a71c8e6901944af90c4ad4dfa39dba7fafc0126..2e79bc8218454d1714dc878b6f07d3ed
         ConnectionProtocol enumprotocol = ConnectionProtocol.getProtocolForPacket(packet);
         ConnectionProtocol enumprotocol1 = this.getCurrentProtocol();
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 88ef769abfa163f923258d1f83d47b28c491eaca..9ae43d359deee3172f8f059adc94dffee1ec303f 100644
+index 0066b1abc008d245825abf1d256cb87fa9c2d877..5efe002efcfa43b2cdd90f2dc127fee89b25b82b 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -327,7 +327,7 @@ public class Main {
+@@ -330,7 +330,7 @@ public class Main {
     // Paper start - fix and optimise world upgrading
     public static void convertWorldButItWorks(net.minecraft.resources.ResourceKey<net.minecraft.world.level.dimension.LevelStem> dimensionType, net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess worldSession,
                                               DataFixer dataFixer, Optional<net.minecraft.resources.ResourceKey<com.mojang.serialization.Codec<? extends net.minecraft.world.level.chunk.ChunkGenerator>>> generatorKey, boolean removeCaches) {
@@ -239,7 +239,7 @@ index 13e749a3c40f0b2cc002f13675a9a56eedbefdac..2995d5f80dd2e9b4b8fbbafe3567a6f2
             LootTable lootTable = this.level.getServer().getLootTables().get(this.lootTable);
             if (player instanceof ServerPlayer) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 34e351e04ac57e47e3cea671c61cc01d17983b77..6b23a65378c7ac05d03bf9e39c3ac428a4d56597 100644
+index 577eefd0990b0d6ae237dd685976975d3532d7fa..1ef21e74e353f178d9031ef253765593147263bb 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
@@ -1,5 +1,6 @@
--- a/patches/server/0011-Fast-speed-check.patch
+++ b/patches/server/0011-Fast-speed-check.patch
@@ -14,10 +14,10 @@ doing questionable/buggy ones, and claiming breathtaking performance improvement
 any of those Spigot forks!

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dbaece0cbf521aada6bda2a2266edf0e97f3055f..9b99a2ebdc642731ee054e4e7e8b4631e0f8c4b2 100644
+index 6f2518ec1be9af4fa00d719c50cbe64e4e57fcbc..9701a89149cc2bd7330b23c441b51677be0bdc18 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1194,7 +1194,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1195,7 +1195,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                 }
 
                 this.tryCheckInsideBlocks();
--- a/patches/server/0021-Skip-entity-move-if-no-movement.patch
+++ b/patches/server/0021-Skip-entity-move-if-no-movement.patch
@@ -9,7 +9,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a12f4725fbe00e2ec55b8fb0bfd167c972566bed..c84fae75546f93c797b4e45234e39475737750c6 100644
+index 9701a89149cc2bd7330b23c441b51677be0bdc18..0032bd550a398c330e16db8081b8dc8ba21333d2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -399,6 +399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -20,7 +20,7 @@ index a12f4725fbe00e2ec55b8fb0bfd167c972566bed..c84fae75546f93c797b4e45234e39475
 
     public void setOrigin(@javax.annotation.Nonnull Location location) {
         this.origin = location.toVector();
-@@ -1034,6 +1035,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1035,6 +1036,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     // Paper end - detailed watchdog information
 
     public void move(MoverType movementType, Vec3 movement) {
@@ -34,7 +34,7 @@ index a12f4725fbe00e2ec55b8fb0bfd167c972566bed..c84fae75546f93c797b4e45234e39475
         // Paper start - detailed watchdog information
         io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
         synchronized (this.posLock) {
-@@ -3820,6 +3828,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3821,6 +3829,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     }
 
     public final void setBoundingBox(AABB boundingBox) {