Fix merge conflicts

gommehdnet · Apr 11, 2024 · 4f45adc · 4f45adc
1 parent 9782d8f
commit 4f45adc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/patches/api/0001-API-for-configurable-hopper-transfer-rates.patch b/patches/api/0001-API-for-configurable-hopper-transfer-rates.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for configurable hopper transfer rates
 
 
 diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 61ea33c1f2dbb546a66f945a01feae437b1381e0..91d63d743ddda142c6ad535b3a4251a3dbe79e13 100644
+index 61ea33c1f2dbb546a66f945a01feae437b1381e0..ee7f2b5dff0de861568748efb477ced5a7b0bd71 100644
 --- a/src/main/java/org/bukkit/block/Hopper.java
 +++ b/src/main/java/org/bukkit/block/Hopper.java
-@@ -21,5 +21,29 @@ public interface Hopper extends Container, LootableBlockInventory { // Paper
+@@ -21,5 +21,30 @@ public interface Hopper extends Container, LootableBlockInventory { // Paper
       */
      int getTransferCooldown();
      // Paper end - Expanded Hopper API

diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch
@@ -21,7 +21,7 @@ index 156809090f1f83ad68e7e2477a3cfddac5757a8e..831344a472dd07bfabba7246d81c9a79
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c0823c612de9dc2a64cc797f061eef25c5f31359..84b258b06aae8a3ea827448dbc291ea456d34a0e 100644
+index c0823c612de9dc2a64cc797f061eef25c5f31359..0e75fc50e77fdc4e134ebf7ece23d5c25b771752 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -15,6 +15,7 @@ import java.util.Map;
@@ -32,7 +32,7 @@ index c0823c612de9dc2a64cc797f061eef25c5f31359..84b258b06aae8a3ea827448dbc291ea4
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
-@@ -1456,7 +1458,8 @@ public class CraftEventFactory {
+@@ -1456,7 +1457,10 @@ public class CraftEventFactory {
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
 
          if (projectile.getShooter() instanceof Player && collided instanceof Player) {
@@ -44,7 +44,7 @@ index c0823c612de9dc2a64cc797f061eef25c5f31359..84b258b06aae8a3ea827448dbc291ea4
                  event.setCancelled(true);
                  return event;
              }
-@@ -1467,6 +1470,15 @@ public class CraftEventFactory {
+@@ -1467,6 +1471,15 @@ public class CraftEventFactory {
      }
      // Paper end
 

diff --git a/patches/server/0014-added-option-to-disable-elytra-in-end-cities.patch b/patches/server/0014-added-option-to-disable-elytra-in-end-cities.patch
@@ -5,17 +5,10 @@ Subject: [PATCH] added option to disable elytra in end cities
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-<<<<<<< HEAD
-index f2e30d8743a97c0541808dc5c03300c0d881b843..a27d74dddbbaae59a800d167e8cbaad54e84af0d 100644
---- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -334,6 +334,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-=======
-index 0cc2307636279915c1f8529e62174cc696e185ee..269881cd0916461a40f10d3607f98809f954a296 100644
+index 0cc2307636279915c1f8529e62174cc696e185ee..81ed6e3ea1b9a6fe7dc3fd34104c370b075deedd 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -336,6 +336,7 @@ public class GlobalConfiguration extends ConfigurationPart {
->>>>>>> origin/master
          public boolean useDimensionTypeForCustomSpawners = false;
          public boolean strictAdvancementDimensionCheck = false;
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;