diff --git a/README.md b/README.md index b372e5b..e3365e7 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ cd Lophine ```kotlin repositories { maven { - url = "https://repo.menthamc.org/repository/maven-public/" + url = "https://repo.bacteriawa.com/repository/maven-public/" } } @@ -71,8 +71,8 @@ dependencies { ```xml - menthamc - https://repo.menthamc.org/repository/maven-public/ + repository + https://repo.bacteriawa.com/repository/maven-public/ diff --git a/README_EN.md b/README_EN.md index baf2067..9b5f325 100644 --- a/README_EN.md +++ b/README_EN.md @@ -57,7 +57,7 @@ After building, you can find the generated JAR file in the `lophine-server/build ```kotlin repositories { maven { - url = "https://repo.menthamc.org/repository/maven-public/" + url = "https://repo.bacteriawa.com/repository/maven-public/" } } @@ -71,8 +71,8 @@ dependencies { ```xml - menthamc - https://repo.menthamc.org/repository/maven-public/ + repository + https://repo.bacteriawa.com/repository/maven-public/ diff --git a/build.gradle.kts b/build.gradle.kts index 957ea83..87e9965 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,7 +44,7 @@ paperweight { } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" -val menthaMavenPublicUrl = "https://repo.menthamc.org/repository/maven-public/"; +val bacteriawaMavenPublicUrl = "https://repo.bacteriawa.com/repository/maven-public/"; subprojects { apply(plugin = "java-library") @@ -59,7 +59,7 @@ subprojects { repositories { mavenCentral() maven(paperMavenPublicUrl) - maven(menthaMavenPublicUrl) + maven(bacteriawaMavenPublicUrl) } dependencies { @@ -91,8 +91,8 @@ subprojects { extensions.configure { repositories { - maven("https://repo.menthamc.org/repository/maven-releases/") { - name = "MenthaMC" + maven("https://repo.bacteriawa.com/repository/maven-releases/") { + name = "Bacteriawa" credentials(PasswordCredentials::class) { username = System.getenv("PRIVATE_MAVEN_REPO_USERNAME") password = System.getenv("PRIVATE_MAVEN_REPO_PASSWORD") diff --git a/gradle.properties b/gradle.properties index 1f8cf36..f3de747 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ release=pre # true for push to repo, false for skip push repo, auto for detect by release value pushRepo=auto -luminolRef=898a3ea8acd362e125357448fb05ef71042cfe98 +luminolRef=5d11bf421d9480136b510b87877733c68d14f05d org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0016-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0016-Leaves-Item-overstack-util.patch index 20498db..0282cd7 100644 --- a/lophine-server/minecraft-patches/features/0016-Leaves-Item-overstack-util.patch +++ b/lophine-server/minecraft-patches/features/0016-Leaves-Item-overstack-util.patch @@ -354,7 +354,7 @@ index 0e86b025bad2c336cc360c2ce764dad0a75de1b6..1873b9376df57ff73d2a1583b60a512c public @Nullable Identifier getNoItemIcon() { diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java -index ab3e1639410269202c0975c11870319e7eaec8a3..92149f9bf679cf4a486b24b5197470de68e0f424 100644 +index 173d4c93c4f3a361946b6fe5d2aa55d596641a98..0a0fef94619eabe8c56082f3c17c663a4943ded0 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -159,7 +159,7 @@ public final class ItemStack implements DataComponentHolder, ItemInstance, Chang diff --git a/lophine-server/minecraft-patches/features/0020-Leaves-Configurable-trading-with-the-void.patch b/lophine-server/minecraft-patches/features/0020-Leaves-Configurable-trading-with-the-void.patch index 07b02e1..013877a 100644 --- a/lophine-server/minecraft-patches/features/0020-Leaves-Configurable-trading-with-the-void.patch +++ b/lophine-server/minecraft-patches/features/0020-Leaves-Configurable-trading-with-the-void.patch @@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/9d2bd3f7b0a48f00d Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 15958045a5076c1836593aee67a9bd1ab19ec4da..bd3821942079118e20d808b5e865b74f6c69e7af 100644 +index 01b5d97c23559aa8036bb53b2b59b7828fd29a12..d5db46a1fb9516cea1078bc2b3beb3f1ba65d54c 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -3161,7 +3161,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet diff --git a/lophine-server/minecraft-patches/features/0021-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0021-Leaves-Servux-Protocol.patch index b2c2b1a..216b603 100644 --- a/lophine-server/minecraft-patches/features/0021-Leaves-Servux-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0021-Leaves-Servux-Protocol.patch @@ -23,7 +23,7 @@ index 8432d0ce22ddc9c9bfa98901e403697f40e53c99..9ec141359c4422c1574dac71a88b7f50 + // Leaves end - servux } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index bd3821942079118e20d808b5e865b74f6c69e7af..e1298bbb83d1d31406c47eaf6d10db3e8d8611ea 100644 +index d5db46a1fb9516cea1078bc2b3beb3f1ba65d54c..813837938b056c64f3059fe773c3d93b4f657867 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -2594,6 +2594,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet diff --git a/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch b/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch index 2d9d611..cd43829 100644 --- a/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch @@ -26,10 +26,10 @@ index d50ed9e165ed68144c4f71bb39f91fc61c61f179..2ada9d75ee70754a3992a32660d125c4 this.player.resetLastActionTime(); int maxY = level.getMaxY(); diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java -index 2da4fd153b3de6e97ef264062b40855aa620ec14..f4b68c02c2beea4438cb4cd212ad70c78cfc68d3 100644 +index b94c4f0a6908a37d8a07dba6ff3ece7193aca1b5..0f4ac8eeb8f5f866b22a81f255f7169754437bfc 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java -@@ -138,7 +138,7 @@ public class BlockItem extends Item { +@@ -140,7 +140,7 @@ public class BlockItem extends Item { } protected @Nullable BlockState getPlacementState(final BlockPlaceContext context) { diff --git a/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch index db0e1da..915c484 100644 --- a/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch +++ b/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch @@ -278,7 +278,7 @@ index e9cd960a0733ac37fac8e956ae36628bf42b79f2..4ab6959f20d8593f504f00a4feaaea7c } } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index e1298bbb83d1d31406c47eaf6d10db3e8d8611ea..41c7179cf2b530d8e4b0fc8161aec75fc9d6c4df 100644 +index 813837938b056c64f3059fe773c3d93b4f657867..81120d1ac352995cd690dff676a3ef6b0d6dd040 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -243,6 +243,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet @@ -732,7 +732,7 @@ index f6d37cba8ab5688501be9170720a0b6ded810819..fdd03c9d73a8a0527d0ead3fbbba2008 final Player player, final ClickAction clickAction, final Slot slot, final ItemStack clicked, final ItemStack carried ) { diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java -index 92149f9bf679cf4a486b24b5197470de68e0f424..9cb7f4a5e7677ee4b66416e13045f0f7dda4cc1c 100644 +index 0a0fef94619eabe8c56082f3c17c663a4943ded0..ed8cb72e4cff33fb8e0f453b1354c0392bbc6934 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -458,7 +458,7 @@ public final class ItemStack implements DataComponentHolder, ItemInstance, Chang diff --git a/lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch index e16433f..249d301 100644 --- a/lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch +++ b/lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch @@ -289,7 +289,7 @@ index 37c9f983ae89c497f44a1b7967d741abf909e0a0..d7fb2505f2a86ca0d81f144624ef2e1a this.setListData(players); diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 41c7179cf2b530d8e4b0fc8161aec75fc9d6c4df..f75249ba1b02efec0f4fc381b02803228e3e1d7c 100644 +index 81120d1ac352995cd690dff676a3ef6b0d6dd040..0ffaec22ab8e336aa4fc540f9e578d37f7640ae4 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -3103,7 +3103,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet diff --git a/lophine-server/minecraft-patches/features/0033-Leaves-Creative-fly-no-clip.patch b/lophine-server/minecraft-patches/features/0033-Leaves-Creative-fly-no-clip.patch index 326fcc4..f01197c 100644 --- a/lophine-server/minecraft-patches/features/0033-Leaves-Creative-fly-no-clip.patch +++ b/lophine-server/minecraft-patches/features/0033-Leaves-Creative-fly-no-clip.patch @@ -81,10 +81,10 @@ index f063e9b7601480d0e66da22ea8e5bec2e8619fee..d46abbea2153cac2d939416fafeac7f9 public boolean isPickable() { return !this.isSpectator() && super.isPickable(); diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java -index f4b68c02c2beea4438cb4cd212ad70c78cfc68d3..4e31e25df5d57086027413bb5e6aa0e4f39452c7 100644 +index 0f4ac8eeb8f5f866b22a81f255f7169754437bfc..3b5aa0c45647c694e908aaae2a027db02b4f8385 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java -@@ -160,8 +160,9 @@ public class BlockItem extends Item { +@@ -162,8 +162,9 @@ public class BlockItem extends Item { Player player = context.getPlayer(); // CraftBukkit start Level world = context.getLevel(); // Paper - Cancel hit for vanished players diff --git a/lophine-server/minecraft-patches/features/0035-Global-Entities-Counter.patch b/lophine-server/minecraft-patches/features/0035-Global-Entities-Counter.patch index d388ac8..3036313 100644 --- a/lophine-server/minecraft-patches/features/0035-Global-Entities-Counter.patch +++ b/lophine-server/minecraft-patches/features/0035-Global-Entities-Counter.patch @@ -99,7 +99,7 @@ index c3b14503e1bd9025730febc883bead942beb61f7..72c4884e9aebc957333cfedf06c6f49f NaturalSpawner.spawnForChunk(this.level, chunk, spawnCookie, spawningCategories); } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index f75249ba1b02efec0f4fc381b02803228e3e1d7c..f4ae59fc4116c0c063effe0c761c69d8c3d33921 100644 +index 0ffaec22ab8e336aa4fc540f9e578d37f7640ae4..e9b19099f8defa8ba39d94fb585dec27a5c804ea 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -822,6 +822,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet diff --git a/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch index af2d0d4..ad19e31 100644 --- a/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch +++ b/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch @@ -74,7 +74,7 @@ index 31702272280b853d8a0a688eb162859412f5a646..156bbc6b959ba4902e683ec0c75d9308 profiler.pop(); diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index f4ae59fc4116c0c063effe0c761c69d8c3d33921..e488eb17cac329899b75b329576066da3e0dd5db 100644 +index e9b19099f8defa8ba39d94fb585dec27a5c804ea..a6696547dcd44bfa46fe45c198327f03f5e663df 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -982,7 +982,18 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet diff --git a/lophine-server/minecraft-patches/features/0039-Instant-Block-Updater.patch b/lophine-server/minecraft-patches/features/0039-Instant-Block-Updater.patch index 6b97add..65b051c 100644 --- a/lophine-server/minecraft-patches/features/0039-Instant-Block-Updater.patch +++ b/lophine-server/minecraft-patches/features/0039-Instant-Block-Updater.patch @@ -38,7 +38,7 @@ index 273260d6c0da23a9cf735ccade55c1ef813b7ddc..bf1aa9f070fac655cdfbe9471947b011 \ No newline at end of file +} diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index e488eb17cac329899b75b329576066da3e0dd5db..46b1fa2b14b1965a6c7e21c011d97ac8bc5064b9 100644 +index a6696547dcd44bfa46fe45c198327f03f5e663df..f3f02ee651a429f98222fe075d048e9798777996 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -1016,11 +1016,15 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet diff --git a/lophine-server/minecraft-patches/features/0042-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch b/lophine-server/minecraft-patches/features/0042-Leaves-Old-Block-remove-behaviour.patch similarity index 80% rename from lophine-server/minecraft-patches/features/0042-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch rename to lophine-server/minecraft-patches/features/0042-Leaves-Old-Block-remove-behaviour.patch index 1bfd743..b0512b7 100644 --- a/lophine-server/minecraft-patches/features/0042-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch +++ b/lophine-server/minecraft-patches/features/0042-Leaves-Old-Block-remove-behaviour.patch @@ -9,17 +9,18 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java -index 4e31e25df5d57086027413bb5e6aa0e4f39452c7..02b8f4aa4aefea0391ab4ce6d634f3a050c80f5a 100644 +index 3b5aa0c45647c694e908aaae2a027db02b4f8385..aebcab247f49ada6af76b3c0e60944134d8f6f88 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java -@@ -76,20 +76,8 @@ public class BlockItem extends Item { - BlockState placedState = level.getBlockState(pos); +@@ -77,21 +77,8 @@ public class BlockItem extends Item { + java.util.function.UnaryOperator context = c -> c.placedBlockAt(pos.immutable()); // Paper - track placed block position from block item if (placedState.is(placementState.getBlock())) { placedState = this.updateBlockStateFromTag(pos, level, itemStack, placedState); - // Paper start - Reset placed block on exception - try { - this.updateCustomBlockEntityTag(pos, level, player, itemStack, placedState); - updateBlockEntityComponents(level, pos, itemStack); +- boolean updatedBlockEntity = this.updateCustomBlockEntityTag(pos, level, player, itemStack, placedState); +- context = context.andThen(c -> c.updatedBlockEntity(updatedBlockEntity))::apply; // track whether the block entity got updated or not +- updateBlockEntityComponents(level, pos, itemStack); - } catch (Exception ex) { - ((org.bukkit.craftbukkit.block.CraftBlockState) previousState).revertPlace(false); - if (player instanceof ServerPlayer serverPlayer) { @@ -30,6 +31,8 @@ index 4e31e25df5d57086027413bb5e6aa0e4f39452c7..02b8f4aa4aefea0391ab4ce6d634f3a0 - throw ex; // Rethrow exception if not placed by a player - } - // Paper end - Reset placed block on exception ++ this.updateCustomBlockEntityTag(pos, level, player, itemStack, placedState); ++ updateBlockEntityComponents(level, pos, itemStack); placedState.getBlock().setPlacedBy(level, pos, placedState, player, itemStack); // CraftBukkit start - special case for handling block placement with water lilies, frog spawn and snow buckets if (player != null && (this instanceof PlaceOnWaterBlockItem || this instanceof SolidBucketItem)) { diff --git a/lophine-server/minecraft-patches/features/0045-Carpet-features.patch b/lophine-server/minecraft-patches/features/0045-Carpet-features.patch index 7773436..a3f56ce 100644 --- a/lophine-server/minecraft-patches/features/0045-Carpet-features.patch +++ b/lophine-server/minecraft-patches/features/0045-Carpet-features.patch @@ -550,10 +550,10 @@ index d46abbea2153cac2d939416fafeac7f905fe0e02..e224c1b8977cd97f2868f7db56c1df22 sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), sound, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility } diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java -index 02b8f4aa4aefea0391ab4ce6d634f3a050c80f5a..af3abbc1b24d0d68cd71f14af2419df52ec5da90 100644 +index aebcab247f49ada6af76b3c0e60944134d8f6f88..eb65e9323f75a28ddc55619bf84d103750631870 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java -@@ -149,8 +149,12 @@ public class BlockItem extends Item { +@@ -150,8 +150,12 @@ public class BlockItem extends Item { // CraftBukkit start Level world = context.getLevel(); // Paper - Cancel hit for vanished players CollisionContext collisionContext = player == null ? CollisionContext.empty() : CollisionContext.placementContext(player); // Leaves - creative no clip diff --git a/lophine-server/paper-patches/features/0004-Leaves-Leaves-Base-Protocol-Core.patch b/lophine-server/paper-patches/features/0004-Leaves-Leaves-Base-Protocol-Core.patch index 7616db1..eaa4e8d 100644 --- a/lophine-server/paper-patches/features/0004-Leaves-Leaves-Base-Protocol-Core.patch +++ b/lophine-server/paper-patches/features/0004-Leaves-Leaves-Base-Protocol-Core.patch @@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/3e7f4a313ff0d2469 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5cbb85056892e71227004ec73463eb390051c9fd..c93a44017c675fb090767e573b5583c8ccbb4e47 100644 +index 3899586cafbe96bede09e86ebe92cc7f735efe97..3a49ce66bcc2451ac049ca4ba1ed32a94a3a1aa6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -479,6 +479,7 @@ public final class CraftServer implements Server { diff --git a/lophine-server/paper-patches/features/0006-Leaves-Leaves-Fakeplayer.patch b/lophine-server/paper-patches/features/0006-Leaves-Leaves-Fakeplayer.patch index e87fee6..ba0bb0c 100644 --- a/lophine-server/paper-patches/features/0006-Leaves-Leaves-Fakeplayer.patch +++ b/lophine-server/paper-patches/features/0006-Leaves-Leaves-Fakeplayer.patch @@ -53,7 +53,7 @@ index 3a47e4c633ee016d5deeb6a5ee9e2e26769d5193..efb47f914fd0c0e966c6921ed1b26c41 if (nmsEntity.level() != this.getHandle().getLevel()) { throw new IllegalArgumentException(entity + " wasn't created with this world, you must create the entity with the world you want to add it to."); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c93a44017c675fb090767e573b5583c8ccbb4e47..3a95cdcb5c507ae61d32b64502b556b5d6f2dc9d 100644 +index 3a49ce66bcc2451ac049ca4ba1ed32a94a3a1aa6..b4586829e0c898702e6a4b593e6c79e56e47429b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -304,6 +304,7 @@ public final class CraftServer implements Server { @@ -148,7 +148,7 @@ index 0232298df7804675cc5bdb85e99991fa9bbfa57a..4e4ff1cdcf88890ad76b39a89399e353 CraftParticle.createParticleParam(particle, data), // Particle force, diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b4efe7185fcefd8e9d62d6eb4348c3e5d8b9eba1..7b14ffd2c68db673a08d9693062e97eac39827be 100644 +index cd15211b08d112811cd9692f7a3a841236dffb5d..e8d7d1cc5feb84b11f3a8c4b7167d29c3345da7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -128,6 +128,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/lophine-server/paper-patches/features/0007-Leaves-Replay-Mod-API.patch b/lophine-server/paper-patches/features/0007-Leaves-Replay-Mod-API.patch index 2a0de04..876b58b 100644 --- a/lophine-server/paper-patches/features/0007-Leaves-Replay-Mod-API.patch +++ b/lophine-server/paper-patches/features/0007-Leaves-Replay-Mod-API.patch @@ -21,7 +21,7 @@ index d0b763f07aee56f69a67c87d7dd15a44b6f44db7..bd301425f4c3cdf2b2bd22c1775b7ca9 } // Leaves end - skip bot diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3a95cdcb5c507ae61d32b64502b556b5d6f2dc9d..ff7afd6bda0cd7be176881c8b7924bf1b5329bbd 100644 +index b4586829e0c898702e6a4b593e6c79e56e47429b..582ab8c10e38492b58c4d4b900b176d755bf289b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -305,6 +305,7 @@ public final class CraftServer implements Server { @@ -54,7 +54,7 @@ index 3a95cdcb5c507ae61d32b64502b556b5d6f2dc9d..ff7afd6bda0cd7be176881c8b7924bf1 + // Leaves end - replay mod api } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 7b14ffd2c68db673a08d9693062e97eac39827be..62bbd17b4f0109ed78f24caf7666edd69c04831b 100644 +index e8d7d1cc5feb84b11f3a8c4b7167d29c3345da7e..9adce19e637c1495fdf5a7a247ea21b2b3c15205 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -129,6 +129,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/settings.gradle.kts b/settings.gradle.kts index 8d04939..28aa6c3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { gradlePluginPortal() mavenLocal() maven("https://repo.papermc.io/repository/maven-public/") - maven("https://repo.menthamc.org/repository/maven-public/") + maven("https://repo.bacteriawa.com/repository/maven-public/") } plugins {