migrated pre-hard-fork patch 0014-added-option-to-disable-elytra-in-e…

…nd-cities.patch

cheetah-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/structure/structures/EndCityPieces.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/level/levelgen/structure/structures/EndCityPieces.java
++++ b/net/minecraft/world/level/levelgen/structure/structures/EndCityPieces.java
+@@ -402,7 +_,7 @@
+                         shulker.setPos(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5);
+                         level.addFreshEntity(shulker);
+                     }
+-                } else if (name.startsWith("Elytra")) {
++                } else if (name.startsWith("Elytra") && io.papermc.paper.configuration.GlobalConfiguration.get().misc.enableElytraInEndCities) { // Cheetah - Added option to disable elytra in end cities
+                     ItemFrame itemFrame = new ItemFrame(level.getLevel(), pos, this.placeSettings.getRotation().rotate(Direction.SOUTH));
+                     itemFrame.setItem(new ItemStack(Items.ELYTRA), false);
+                     level.addFreshEntity(itemFrame);

cheetah-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch

@@ -0,0 +1,10 @@
+--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+@@ -344,6 +_,7 @@
+         public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
+         @Comment("Defines the leniency distance added on the server to the interaction range of a player when validating interact packets.")
+         public DoubleOr.Default clientInteractionLeniencyDistance = DoubleOr.Default.USE_DEFAULT;
++        public boolean enableElytraInEndCities = true; // Cheetah - Added option to disable elytra in end cities
+     }
+
+     public BlockUpdates blockUpdates;