[ci-skip] clean up patches

PurpurMC · Aug 31, 2021 · 0af31a9 · 0af31a9
1 parent 8f80451
commit 0af31a9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/patches/server/0010-Barrels-and-enderchests-6-rows.patch b/patches/server/0010-Barrels-and-enderchests-6-rows.patch
@@ -112,18 +112,10 @@ index 7e45c97acce83a9fe8ada486e9fcdafe58769736..e3c84ad3fad4ee479bb00b7dc02a2502
                  }, CONTAINER_TITLE));
                  player.awardStat(Stats.OPEN_ENDERCHEST);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index f494063ead9c6303fb3ca880aba2a877ae8d83ab..91667ef99f5e962a3c77334ce040261c753edce1 100644
+index f494063ead9c6303fb3ca880aba2a877ae8d83ab..aa4d3a8a51050df14d5df4a494ee6665a065e2cb 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -16,6 +16,7 @@ import net.minecraft.world.entity.player.Inventory;
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.inventory.AbstractContainerMenu;
- import net.minecraft.world.inventory.ChestMenu;
-+import net.minecraft.world.inventory.MenuType;
- import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.level.block.BarrelBlock;
-@@ -68,7 +69,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -68,7 +68,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
 
      public BarrelBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.BARREL, pos, state);
@@ -141,7 +133,7 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..91667ef99f5e962a3c77334ce040261c
          this.openersCounter = new ContainerOpenersCounter() {
              @Override
              protected void onOpen(Level world, BlockPos pos, BlockState state) {
-@@ -120,7 +130,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -120,7 +129,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
 
      @Override
      public int getContainerSize() {
@@ -159,7 +151,7 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..91667ef99f5e962a3c77334ce040261c
      }
 
      @Override
-@@ -140,7 +159,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -140,7 +158,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
 
      @Override
      protected AbstractContainerMenu createMenu(int syncId, Inventory playerInventory) {
@@ -178,7 +170,7 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..91667ef99f5e962a3c77334ce040261c
 
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b634d1a67b741feadf3f8fda5439a501fef3d132..57b90d6f12f58ea4297cc45985151598e6c390ab 100644
+index d6c27e3e0f7c3a574c00dc86bf76f8a4a9dc0213..995c77d2ea5a095d1529fc0507703d64f59028c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -174,4 +174,39 @@ public class PurpurConfig {

diff --git a/patches/server/0159-Dont-run-with-scissors.patch b/patches/server/0159-Dont-run-with-scissors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d73f44edca1b13a98f858ae0c1fd0bc79055a12..eebca9b362b8747aaec3708d4f233d398ba22ad1 100644
+index 3d73f44edca1b13a98f858ae0c1fd0bc79055a12..c0ab928ecff6aea1544406576e689979a2e474e9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1555,6 +1555,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -22,28 +22,21 @@ index 3d73f44edca1b13a98f858ae0c1fd0bc79055a12..eebca9b362b8747aaec3708d4f233d39
                                  this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
                                  this.lastGoodX = this.player.getX();
                                  this.lastGoodY = this.player.getY();
-@@ -1567,6 +1574,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1567,6 +1574,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
      }
 
 +    // Purpur start
 +    public boolean isScissor(ItemStack stack) {
-+        boolean hasCustomModelData = false;
-+        if (stack.getTag() != null) {
-+            if (stack.getTag().contains("CustomModelData") && stack.getTag().getInt("CustomModelData") != 0) {
-+                hasCustomModelData = true;
-+            }
-+        }
-+
-+        return stack.is(Items.SHEARS) && !hasCustomModelData;
++        return stack.is(Items.SHEARS) && (stack.getTag() == null || stack.getTag().getInt("CustomModelData") == 0);
 +    }
 +    // Purpur end
 +
      // Paper start - optimise out extra getCubes
      private boolean hasNewCollision(final ServerLevel world, final Entity entity, final AABB oldBox, final AABB newBox) {
          final List<AABB> collisions = io.papermc.paper.util.CachedLists.getTempCollisionList();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a51de18eee2caf87b710e3ab863b7157d093859c..d8ec1c94b018ce566ed81a41023b4192557dc06d 100644
+index a81a42ea6f904f19271ed529a19635503e66ac69..9e445948bd15d94ed74638ed814fa1abf7bacf1c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -165,6 +165,7 @@ public class PurpurConfig {

diff --git a/patches/server/0254-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0254-Shift-right-click-to-use-exp-for-mending.patch
@@ -36,10 +36,10 @@ index 693c6cbd90cde4d605931c6d80ae8056e260bf34..645c76e6dd50d915263db576650c7a62
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eebca9b362b8747aaec3708d4f233d398ba22ad1..6b3aaaf7f2cbd72de2ad8834bea28c096ab1c7ba 100644
+index c0ab928ecff6aea1544406576e689979a2e474e9..86ed3f8491ea7ad117ac36be0d4bf304489c79f1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1915,6 +1915,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1908,6 +1908,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
 
              boolean cancelled;
              if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {