rebase

PaperMC · Feb 24, 2024 · fdb3a73 · fdb3a73
1 parent 8d0c8ab
commit fdb3a73
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/patches/server/0929-Fix-inventory-desync.patch b/patches/server/0929-Fix-inventory-desync.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix inventory desync
 Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bed0a01be1703aad8fbfa549d5799e3f84759f32..8a7df0ff01c91754a70e27d688539b2e7a3a715c 100644
+index cc82b269d422f6cd720021ba009606cab1b90590..c17ddc236e0f36b6dcec13390b4218cad93a41e7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4028,6 +4028,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4044,6 +4044,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
              if (this.useItem.useOnRelease()) {
                  this.updatingUsingItem();
              }

diff --git a/patches/server/0974-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0974-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
@@ -26,10 +26,10 @@ index 3fec07b250a8f145e30c8c41888e47d2a3c902e1..2ddd033e1c3a2e5c8950b93c83849192
                  x = to.getX();
                  y = to.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 211e9bb82e65bdd5811c3b4df7ac93741fc7cdc3..e2e5ec647725f1f16067003ec773530d72fc5fcf 100644
+index da56d2bbf0da98562f5da392649212ddd70d9532..f8ba9c3823528a67bd216dde434ff64edb0f9ec5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4201,7 +4201,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4205,7 +4205,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      if (!(this instanceof ServerPlayer)) {
                          EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.level().getWorld(), d3, d4, d5), new Location(this.level().getWorld(), d0, d6, d2));
                          this.level().getCraftServer().getPluginManager().callEvent(teleport);

diff --git a/patches/server/1031-Lag-compensation-ticks.patch b/patches/server/1031-Lag-compensation-ticks.patch
@@ -63,7 +63,7 @@ index ef3048a4748113538a0ee0af5b526b2cd51d5c29..a7b217ddbcbf92513bd38101fdfca207
 
          if (this.hasDelayedDestroy) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 34e06b4f534215f7eead54a3b0467fd5e2d478db..23570a0b1227a840b9c1e6ae326827ea655bb5f7 100644
+index 82c0254dfd5c1868cebf2692cacebf2d62bdb616..bc084de96f549c1e07056c290747ce1707c151c1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3849,6 +3849,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -115,7 +115,7 @@ index 34e06b4f534215f7eead54a3b0467fd5e2d478db..23570a0b1227a840b9c1e6ae326827ea
              }
          }
 
-@@ -4048,7 +4063,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4079,7 +4094,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
 
          this.useItem = ItemStack.EMPTY;