diff --git a/README.md b/README.md index 744df2e..a1c3ce6 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,11 @@ repositories { } dependencies { - compileOnly("fun.bm.lophine:lophine-api:$VERSION") + compileOnly("fun.bm.lophine:lophine-api:26.2.build.+") +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(25)) } ``` @@ -86,7 +90,7 @@ dependencies { fun.bm.lophine lophine-api - $VERSION + [26.1.2.build,) ``` diff --git a/README_EN.md b/README_EN.md index e2e7681..87c6e23 100644 --- a/README_EN.md +++ b/README_EN.md @@ -67,7 +67,11 @@ repositories { } dependencies { - compileOnly("fun.bm.lophine:lophine-api:$VERSION") + compileOnly("fun.bm.lophine:lophine-api:26.2.build.+") +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(25)) } ``` @@ -85,7 +89,7 @@ dependencies { fun.bm.lophine lophine-api - $VERSION + [26.1.2.build,) provided diff --git a/gradle.properties b/gradle.properties index fb14789..3190dcf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=fun.bm.lophine mcVersion=26.2 apiVersion=26.2 -channel=STABLE +channel=BETA clipVersion=1.0.0 weightVersion=2.0.15 # true for release, false for skip release, pre for pre-release @@ -9,7 +9,7 @@ release=pre # true for push to repo, false for skip push repo, auto for detect by release value pushRepo=auto -foliaRef=602048cb815db2ded68cca8cd43f480b983185a1 +foliaRef=e48800d446d2bdeb24a8d31d671554440687e846 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0001-Luminol-Config-System.patch b/lophine-server/minecraft-patches/features/0001-Luminol-Config-System.patch index 8859a16..988d6cb 100644 --- a/lophine-server/minecraft-patches/features/0001-Luminol-Config-System.patch +++ b/lophine-server/minecraft-patches/features/0001-Luminol-Config-System.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Luminol Config System diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java -index a4d608d64b7d3477c9144d93547fd3b4f39a1b02..2a75f8fbd2e5f41ca138740319d34683915e3b5b 100644 +index e2939cc39a8c103e4c4d7b01d39b5546486e4fbc..a557d488e4e289a61aeb9aed0cc133a0a7ce8f8c 100644 --- a/net/minecraft/server/Main.java +++ b/net/minecraft/server/Main.java -@@ -107,6 +107,7 @@ public class Main { +@@ -110,6 +110,7 @@ public class Main { JvmProfiler.INSTANCE.start(Environment.SERVER); } diff --git a/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch b/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch index 15ce64a..6c36d8d 100644 --- a/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch +++ b/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Correct player respawn place diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index fbe0ef19bfabfc42d9e0e08e17b08159321b3804..44b3dfbf529630d8cca9a4270ae2a7c94c5a077c 100644 +index 57f93d978fe48fdf6e77b7bfb9f1de060e1a8524..924d5f3236d9ba9836f39fc844392099df9cd25c 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -511,8 +511,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -43,7 +43,7 @@ index fbe0ef19bfabfc42d9e0e08e17b08159321b3804..44b3dfbf529630d8cca9a4270ae2a7c9 if (inChunk == null) { continue; } -@@ -2018,7 +2030,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1997,7 +2009,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc } if (newLevel.dimension() == lastDimension) { diff --git a/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch b/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch index 223a1ad..76f5798 100644 --- a/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch +++ b/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Do not enable any debug subscriptions Really this would really crash the server by accident when the operators used F3 + J or toggled the debug synchronizer diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 44b3dfbf529630d8cca9a4270ae2a7c94c5a077c..34cc36f6bdf435593d16f2e7af280a27be048280 100644 +index 924d5f3236d9ba9836f39fc844392099df9cd25c..fe34f2e648df9fd1174522baa5913976104b8d04 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -3504,7 +3504,8 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -3483,7 +3483,8 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc } public Set> debugSubscriptions() { diff --git a/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch b/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch index c26bcc2..732827e 100644 --- a/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch +++ b/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix riding statistics desync Referred to: https://github.com/CraftCanvasMC/Canvas/commit/057175b0c10d5a4d1d9059fd9d077750c32633b2 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 34cc36f6bdf435593d16f2e7af280a27be048280..98d1ab3aa8dfbe571371d01544da2750339ce988 100644 +index fe34f2e648df9fd1174522baa5913976104b8d04..fee4749c7938779f63155297bf9c7aeb0ca21709 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -2537,7 +2537,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2516,7 +2516,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc } } @@ -19,7 +19,7 @@ index 34cc36f6bdf435593d16f2e7af280a27be048280..98d1ab3aa8dfbe571371d01544da2750 int distance = Math.round((float)Math.sqrt(dx * dx + dy * dy + dz * dz) * 100.0F); Entity vehicle = this.getVehicle(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index a2b57f62b745dd21e215f919d335f14f5cb1706f..2cf8bdf6c4ab04ab42829b7af5eb89e6bd509d7a 100644 +index 07310ae30817fc88227355739074615969b48184..47eef926f57053ace7ea140261570c4970822062 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4198,7 +4198,13 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0013-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch b/lophine-server/minecraft-patches/features/0013-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch index 240c251..c4d7cc3 100644 --- a/lophine-server/minecraft-patches/features/0013-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch +++ b/lophine-server/minecraft-patches/features/0013-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch @@ -9,7 +9,7 @@ Almost the same bug as: https://github.com/PaperMC/Folia/pull/418 and https://github.com/PaperMC/Folia/issues/393 diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java -index 501a0e89cc7bcfce6793f059b080b38666e0fb64..ad35eafa457f706879ba8a9c92b3a34e620ee2d6 100644 +index d0dba5cc351903fb762e231a95f302479794185f..fb00f70505a6c548cd1311d7ea55c6a501e814e3 100644 --- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java +++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java @@ -264,7 +264,8 @@ public class ThrownEnderpearl extends ThrowableItemProjectile { diff --git a/lophine-server/minecraft-patches/features/0016-Fix-entity-portal-teleport-speed.patch b/lophine-server/minecraft-patches/features/0016-Fix-entity-portal-teleport-speed.patch index 69ac73a..6201d7d 100644 --- a/lophine-server/minecraft-patches/features/0016-Fix-entity-portal-teleport-speed.patch +++ b/lophine-server/minecraft-patches/features/0016-Fix-entity-portal-teleport-speed.patch @@ -46,7 +46,7 @@ index c6434ff2e5c211887c2e98c8462a49e0e1cb5b21..534f103234eb92571c664cbcfea4ce4e } else {entity.inactiveTick();} // Paper - EAR 2 profiler.pop(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 2cf8bdf6c4ab04ab42829b7af5eb89e6bd509d7a..a52d5c0ba970d666fd57e075d14350ff07401bac 100644 +index 47eef926f57053ace7ea140261570c4970822062..7953b7ece0b5e3f41e85252cdfd8e400fab212ae 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -387,6 +387,7 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch b/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch index 29fc78a..5503d82 100644 --- a/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch +++ b/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix player auto saving ignores interval diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 98d1ab3aa8dfbe571371d01544da2750339ce988..264de9099b19779f20ad23c41d0967670759ae12 100644 +index fee4749c7938779f63155297bf9c7aeb0ca21709..5668906866917f7bb6088ae16146d917d2b840b0 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -208,7 +208,7 @@ import org.slf4j.Logger; diff --git a/lophine-server/minecraft-patches/features/0020-Prevent-teleprotAsync-calls-in-move-events.patch b/lophine-server/minecraft-patches/features/0020-Prevent-teleprotAsync-calls-in-move-events.patch index 40c0c0f..be45b0c 100644 --- a/lophine-server/minecraft-patches/features/0020-Prevent-teleprotAsync-calls-in-move-events.patch +++ b/lophine-server/minecraft-patches/features/0020-Prevent-teleprotAsync-calls-in-move-events.patch @@ -29,7 +29,7 @@ index c1faaf7d514c23d756aa626fa93aabd8bb503463..0c5fb17e7cce18eac68183cc3b5de6fc // If the event is cancelled we move the player back to their old location. if (event.isCancelled()) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index a52d5c0ba970d666fd57e075d14350ff07401bac..72f89eaba2ca8b66fa07a6378d93917dec83c688 100644 +index 7953b7ece0b5e3f41e85252cdfd8e400fab212ae..343e4bb41acfab4e50729aa5dbe2a071dac376a3 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4476,12 +4476,25 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch b/lophine-server/minecraft-patches/features/0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch index 34524ca..2dc153e 100644 --- a/lophine-server/minecraft-patches/features/0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch +++ b/lophine-server/minecraft-patches/features/0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch @@ -17,7 +17,7 @@ index b31b55f00e2ce1bd6c1011fe852bd1dbb37de524..75c36cbf86e56d4993169688a13f22cc } diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 72f89eaba2ca8b66fa07a6378d93917dec83c688..6b7382f06a8c76b216b081e66789fe51466b1e29 100644 +index 343e4bb41acfab4e50729aa5dbe2a071dac376a3..c04917f31585d9d670cc98cda8eb36187f4261d7 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4460,6 +4460,7 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch b/lophine-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch index ba478fc..46b011d 100644 --- a/lophine-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch +++ b/lophine-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch @@ -8,7 +8,7 @@ On folia, entity usually cannot move out of the tickregion, but sometimes it act Reference from : https://github.com/KaiijuMC/Kaiiju/blob/ver/1.20.1/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 6b7382f06a8c76b216b081e66789fe51466b1e29..8c909108a0c468f353837787188c12f907369b9b 100644 +index c04917f31585d9d670cc98cda8eb36187f4261d7..9270b887448023b6ace2e7fae6b632755ce90600 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1163,6 +1163,19 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch b/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch index 762bab6..4077615 100644 --- a/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch +++ b/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch @@ -33,7 +33,7 @@ index 13d7965fd4f99f0848b080349df41f8b1c31a19b..5b83f2edd6afe94c28bf491afab737e9 nmsEntity.stopRiding(); nmsEntity.teleportAsync( diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java -index ad35eafa457f706879ba8a9c92b3a34e620ee2d6..790c1bcf11150d31bf90c32345e4eb40de9a6a41 100644 +index fb00f70505a6c548cd1311d7ea55c6a501e814e3..4df9a3356cfdee52761db47694e59779976840db 100644 --- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java +++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java @@ -99,7 +99,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile { diff --git a/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch b/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch index cbd4202..bcb3094 100644 --- a/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch +++ b/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch @@ -275,10 +275,10 @@ index 534f103234eb92571c664cbcfea4ce4e990d3ea8..c4d9d890db784d376b876d70f0468df6 // CraftBukkit start private final ResourceKey typeKey; diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 264de9099b19779f20ad23c41d0967670759ae12..ab6229ee412cf2aa5affc87510230c587765080b 100644 +index 5668906866917f7bb6088ae16146d917d2b840b0..4efbd0f840d74a3d96b28d38e48cba72d5c6fb9b 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -1705,7 +1705,30 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1694,7 +1694,30 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc ServerLevel origin = this.level(); ServerPlayer.RespawnConfig respawnConfig = this.getRespawnConfig(); @@ -310,7 +310,7 @@ index 264de9099b19779f20ad23c41d0967670759ae12..ab6229ee412cf2aa5affc87510230c58 // modified based off PlayerList#respawn -@@ -1756,8 +1779,8 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1745,8 +1768,8 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc // now the respawn logic is complete // last, call the function callback @@ -429,7 +429,7 @@ index 48f51b0f94df3e59c9410129489c63a4287bc0bc..2682f8702785b1e501748a308c5e394b private final Vec2 spawnAngle; diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 8c909108a0c468f353837787188c12f907369b9b..1dd0ce3f8af52f5ba0da1d6617489a0de2c971b2 100644 +index 9270b887448023b6ace2e7fae6b632755ce90600..66ddbdb130867a508ba161a570d101dbe6353246 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -392,6 +392,9 @@ public abstract class Entity @@ -495,7 +495,7 @@ index 8c909108a0c468f353837787188c12f907369b9b..1dd0ce3f8af52f5ba0da1d6617489a0d return true; } -@@ -4864,6 +4886,13 @@ public abstract class Entity +@@ -4868,6 +4890,13 @@ public abstract class Entity ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(initialPosition), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(initialPosition) ); @@ -509,7 +509,7 @@ index 8c909108a0c468f353837787188c12f907369b9b..1dd0ce3f8af52f5ba0da1d6617489a0d // first, remove entity/passengers from world EntityTreeNode passengerTree = this.detachPassengers(); -@@ -4921,6 +4950,10 @@ public abstract class Entity +@@ -4925,6 +4954,10 @@ public abstract class Entity if (info.postTeleportTransition() != null) { info.postTeleportTransition().onTransition(teleported); } diff --git a/lophine-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch b/lophine-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch index 6cd24c0..4249346 100644 --- a/lophine-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/lophine-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -8,10 +8,10 @@ As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2e Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 1dd0ce3f8af52f5ba0da1d6617489a0de2c971b2..cf70a8e2fe2fe70bcdf71f8112479031d80d8b75 100644 +index 66ddbdb130867a508ba161a570d101dbe6353246..df82f900580ad1b71960eab890a7a6215f578421 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4676,14 +4676,18 @@ public abstract class Entity +@@ -4676,15 +4676,19 @@ public abstract class Entity targetPos, 16, // load 16 blocks to be safe from block physics ca.spottedleaf.concurrentutil.util.Priority.HIGH, (chunks) -> { @@ -28,13 +28,14 @@ index 1dd0ce3f8af52f5ba0da1d6617489a0de2c971b2..cf70a8e2fe2fe70bcdf71f8112479031 portalInfoCompletable.complete( new net.minecraft.world.level.portal.TeleportTransition( - destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, Direction.WEST.toYRot(), 0.0f, -- Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)), + destination, finalPos, this.getDeltaMovement(), Direction.WEST.toYRot(), 0.0f, // Kaiiju - Vanilla end teleportation + false, false, +- Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)), + /*Relative.union(Relative.DELTA, Set.of(Relative.X_ROT))*/Set.of(), // Kaiiju - Vanilla end teleportation TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), - org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL - ) -@@ -4698,11 +4702,15 @@ public abstract class Entity + org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL, + TeleportTransition.PassengerTeleportationMode.POSITION_RIDER +@@ -4700,11 +4704,15 @@ public abstract class Entity ca.spottedleaf.concurrentutil.util.Priority.HIGH, (chunks) -> { BlockPos adjustedSpawn = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, spawnPos); @@ -49,10 +50,10 @@ index 1dd0ce3f8af52f5ba0da1d6617489a0de2c971b2..cf70a8e2fe2fe70bcdf71f8112479031 new net.minecraft.world.level.portal.TeleportTransition( - destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 0.0f, 0.0f, + destination, finalPos, this.getDeltaMovement(), 0.0f, 0.0f, // Kaiiju - Vanilla end teleportation + false, false, Relative.union(Relative.DELTA, Relative.ROTATION), TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), - org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL -@@ -4881,6 +4889,10 @@ public abstract class Entity +@@ -4885,6 +4893,10 @@ public abstract class Entity return false; } @@ -63,7 +64,7 @@ index 1dd0ce3f8af52f5ba0da1d6617489a0de2c971b2..cf70a8e2fe2fe70bcdf71f8112479031 Vec3 initialPosition = this.position(); ChunkPos initialPositionChunk = new ChunkPos( ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(initialPosition), -@@ -4955,9 +4967,14 @@ public abstract class Entity +@@ -4959,9 +4971,14 @@ public abstract class Entity destination.levelUnloadStateLock.releaseRead(); // Luminol end diff --git a/lophine-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch b/lophine-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch index 789079b..b960528 100644 --- a/lophine-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch +++ b/lophine-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch @@ -27,7 +27,7 @@ index 480b6b2405706fd4d7158d0e160adafd84099887..137389f7ee97fc3a15c8f5f87c058065 } } diff --git a/net/minecraft/world/level/block/EndPortalBlock.java b/net/minecraft/world/level/block/EndPortalBlock.java -index d42bb2a1721e4ab8c9956e18c3ca418b8d648c59..4f06daf619596d4116140b0710ea92c2c8552fc0 100644 +index 123df098fa987030fe3789f36ff95aeee2979834..35b0632faf2709f65f731cd42e575ee967937254 100644 --- a/net/minecraft/world/level/block/EndPortalBlock.java +++ b/net/minecraft/world/level/block/EndPortalBlock.java @@ -76,6 +76,12 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal { diff --git a/lophine-server/minecraft-patches/features/0034-Add-config-for-vanilla-random.patch b/lophine-server/minecraft-patches/features/0034-Add-config-for-vanilla-random.patch index 8b43f3a..0b23630 100644 --- a/lophine-server/minecraft-patches/features/0034-Add-config-for-vanilla-random.patch +++ b/lophine-server/minecraft-patches/features/0034-Add-config-for-vanilla-random.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for vanilla random diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index cf70a8e2fe2fe70bcdf71f8112479031d80d8b75..17650e196f1e5b79765651bf302291873a4eb509 100644 +index df82f900580ad1b71960eab890a7a6215f578421..39f2b44846c02796a3671a5dec75b7b34d8c488e 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -298,7 +298,7 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch b/lophine-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch index 81bc4d2..37c8550 100644 --- a/lophine-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch +++ b/lophine-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add force the data command to be enabled config diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index bc9f6cc286536b87513de81855ad0b61cf787c84..afbaf2116930d72ebb0c77745d02115abab14dc4 100644 +index 4ddb5e7ce3529466c3930caa9aa6b18158e9a63d..9b1dcfadd6d5ae868b087a18983d03e8bb86b56a 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -202,7 +202,9 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0043-Add-back-read-only-datapack-command-Fix-datapack-com.patch b/lophine-server/minecraft-patches/features/0043-Add-back-read-only-datapack-command-Fix-datapack-com.patch index ebc507c..71f129d 100644 --- a/lophine-server/minecraft-patches/features/0043-Add-back-read-only-datapack-command-Fix-datapack-com.patch +++ b/lophine-server/minecraft-patches/features/0043-Add-back-read-only-datapack-command-Fix-datapack-com.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add back read-only datapack command & Fix datapack command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index afbaf2116930d72ebb0c77745d02115abab14dc4..6823c41c08ca1a1baf9257fc861ae97bbcbe3a50 100644 +index 9b1dcfadd6d5ae868b087a18983d03e8bb86b56a..21f2b9866e1cf36421e10a945fb6fbaa251009ed 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -205,7 +205,7 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch b/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch index 8a595e9..5777efd 100644 --- a/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch +++ b/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch @@ -106,7 +106,7 @@ index 0641b98ef3298eb682ceae83f60b730f3bf90103..cea4bc7036dfd8777c151a0dd811fc13 } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index ab6229ee412cf2aa5affc87510230c587765080b..f0c574e039f80ff0227239356de8d61ef06a0936 100644 +index 4efbd0f840d74a3d96b28d38e48cba72d5c6fb9b..8e4bbb224d036cf9f33667aec57bbc339c9e8377 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -441,7 +441,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -183,10 +183,10 @@ index f03fa06c0ba56f7f5e1e45bc1568a490751efde3..eee1c14249addbf4714df733870da974 + // KioCG end } diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 17650e196f1e5b79765651bf302291873a4eb509..f218b7f6ce32d7ac959255e59c620d6fd420bf8e 100644 +index 39f2b44846c02796a3671a5dec75b7b34d8c488e..fe0208815dbf53855d47956925b817570f6ae5b0 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -6468,4 +6468,6 @@ public abstract class Entity +@@ -6479,4 +6479,6 @@ public abstract class Entity return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition()); } // Paper end diff --git a/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch index ead962b..3f723da 100644 --- a/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch +++ b/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch @@ -100,7 +100,7 @@ index 58e557923dfe6cee39ec45e7f5aa43a5ded9f107..57a35d7a801621fc461e896eb2bba533 this.scheduler.regionFailed(this, false, thr); // regionFailed will schedule a shutdown, so we should avoid letting this region tick further diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 6823c41c08ca1a1baf9257fc861ae97bbcbe3a50..0fa14f60310b063f419620539fd40898627b46b9 100644 +index 21f2b9866e1cf36421e10a945fb6fbaa251009ed..aa7931c9b6dc3bba2c8dfecff8df2db302ad905b 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -259,7 +259,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch b/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch index 472673e..3c3a110 100644 --- a/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch +++ b/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add missing teleportation event APIs for folia diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index f0c574e039f80ff0227239356de8d61ef06a0936..093c48e2379c01f45277b88f6c1b19b107a46326 100644 +index 8e4bbb224d036cf9f33667aec57bbc339c9e8377..4397f77d0169a3eefd347d3097657de4f6d37ef8 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -1814,6 +1814,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1803,6 +1803,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc if (finalRespawnCompleteCallback != null) { // Luminol - Level hot unload apis finalRespawnCompleteCallback.accept(ServerPlayer.this); // Luminol - Level hot unload apis } @@ -19,7 +19,7 @@ index f0c574e039f80ff0227239356de8d61ef06a0936..093c48e2379c01f45277b88f6c1b19b1 ); }); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index f218b7f6ce32d7ac959255e59c620d6fd420bf8e..2ae0cf7c9a4febfa79a9eab2f0e9309a61a78f56 100644 +index fe0208815dbf53855d47956925b817570f6ae5b0..90b5d7806af8913735c4105b6e347bfdb78094e0 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4553,6 +4553,31 @@ public abstract class Entity @@ -72,7 +72,7 @@ index f218b7f6ce32d7ac959255e59c620d6fd420bf8e..2ae0cf7c9a4febfa79a9eab2f0e9309a // need to load chunks so we can create the platform destination.moonrise$loadChunksAsync( targetPos, 16, // load 16 blocks to be safe from block physics -@@ -4696,6 +4732,17 @@ public abstract class Entity +@@ -4698,6 +4734,17 @@ public abstract class Entity ); } else { BlockPos spawnPos = destination.getRespawnData().pos(); @@ -90,7 +90,7 @@ index f218b7f6ce32d7ac959255e59c620d6fd420bf8e..2ae0cf7c9a4febfa79a9eab2f0e9309a // need to load chunk for heightmap destination.moonrise$loadChunksAsync( spawnPos, 0, -@@ -4751,7 +4798,17 @@ public abstract class Entity +@@ -4755,7 +4802,17 @@ public abstract class Entity WorldBorder destinationBorder = destination.getWorldBorder(); double dimensionScale = net.minecraft.world.level.dimension.DimensionType.getTeleportationScale(origin.dimensionType(), destination.dimensionType()); BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); @@ -108,7 +108,7 @@ index f218b7f6ce32d7ac959255e59c620d6fd420bf8e..2ae0cf7c9a4febfa79a9eab2f0e9309a ca.spottedleaf.concurrentutil.completable.CallbackCompletable portalFound = new ca.spottedleaf.concurrentutil.completable.CallbackCompletable<>(); -@@ -4888,6 +4945,15 @@ public abstract class Entity +@@ -4892,6 +4949,15 @@ public abstract class Entity if (!this.canPortalAsync(destination, takePassengers)) { return false; } diff --git a/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch b/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch index d61d188..de21843 100644 --- a/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch +++ b/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for waypoint restoration diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 0fa14f60310b063f419620539fd40898627b46b9..9800ae1d3c49800b0c7342d43d696109b5b72cf4 100644 +index aa7931c9b6dc3bba2c8dfecff8df2db302ad905b..c67ea715f02086e5a39cc5832ccdc0b32199db93 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -267,7 +267,7 @@ public class Commands { @@ -47,7 +47,7 @@ index 402e2f01f2b3a8e9ce5c818f07581b4dab38fc26..a1c3f3e5c7c3f32e0bdead33ebd72c76 //this.updateSkyBrightness(); // Folia - region threading - delay until first tick // Paper start - rewrite chunk system diff --git a/net/minecraft/world/waypoints/WaypointTransmitter.java b/net/minecraft/world/waypoints/WaypointTransmitter.java -index 2866b750a28cc32c2913d3c1afee95f05956982c..f0b62f49382eb808dcd6b6b654b99b9f7763c342 100644 +index 07af92310ee5c8bba04e6175b6faac629632e4de..79561456c3b0877974ae1519443ebf8bd07533da 100644 --- a/net/minecraft/world/waypoints/WaypointTransmitter.java +++ b/net/minecraft/world/waypoints/WaypointTransmitter.java @@ -76,7 +76,8 @@ public interface WaypointTransmitter extends Waypoint { diff --git a/lophine-server/minecraft-patches/features/0066-Leaves-Lithium-Sleeping-Block-Entity.patch b/lophine-server/minecraft-patches/features/0066-Leaves-Lithium-Sleeping-Block-Entity.patch index 356e2bd..197647f 100644 --- a/lophine-server/minecraft-patches/features/0066-Leaves-Lithium-Sleeping-Block-Entity.patch +++ b/lophine-server/minecraft-patches/features/0066-Leaves-Lithium-Sleeping-Block-Entity.patch @@ -240,7 +240,7 @@ index 6e08d50794c4af4405f3e164a3fd46f376b3f78f..dd2d0940eece3e85078e574f66f71a4c int getContainerSize(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 2ae0cf7c9a4febfa79a9eab2f0e9309a61a78f56..6b3c691dcc9c9e4a8b2b43110aedd5d5131a9520 100644 +index 90b5d7806af8913735c4105b6e347bfdb78094e0..0ba8f401c9cd0e15187b4faee78667c543fded92 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -324,7 +324,7 @@ public abstract class Entity @@ -266,7 +266,7 @@ index 2ae0cf7c9a4febfa79a9eab2f0e9309a61a78f56..6b3c691dcc9c9e4a8b2b43110aedd5d5 if (copy instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon) dragon.syncDragonPartsAfterTeleportTransform(); // Luminol - Sync dragon part when teleportation or firstly created // vanilla code used to call remove _after_ copying, and some stuff is required to be after copy - so add hook here // for example, clearing of inventory after switching dimensions -@@ -6140,8 +6142,29 @@ public abstract class Entity +@@ -6151,8 +6153,29 @@ public abstract class Entity this.setBoundingBox(this.makeBoundingBox()); } // Paper end - Block invalid positions and bounding box diff --git a/lophine-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch b/lophine-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch index c75d8ff..be8c318 100644 --- a/lophine-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/lophine-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -10,7 +10,7 @@ VMP (https://github.com/RelativityMC/VMP-fabric) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 6b3c691dcc9c9e4a8b2b43110aedd5d5131a9520..d1298c499f6551d7a084f2d1ccd2a2b8b9a2475b 100644 +index 0ba8f401c9cd0e15187b4faee78667c543fded92..ae0504263666103a588b6855cb27304582c38938 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1155,8 +1155,14 @@ public abstract class Entity @@ -28,7 +28,7 @@ index 6b3c691dcc9c9e4a8b2b43110aedd5d5131a9520..d1298c499f6551d7a084f2d1ccd2a2b8 final Vec3 originalMovement = delta; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -5634,6 +5640,11 @@ public abstract class Entity +@@ -5645,6 +5651,11 @@ public abstract class Entity } public final void setBoundingBox(final AABB bb) { diff --git a/lophine-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch b/lophine-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch index 16fdaf3..9c78487 100644 --- a/lophine-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch +++ b/lophine-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch @@ -20,7 +20,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index d1298c499f6551d7a084f2d1ccd2a2b8b9a2475b..1888210d014f9c00316059a7ccce086dfb0e3a0f 100644 +index ae0504263666103a588b6855cb27304582c38938..92cb0b1722bd5bcf9996c3f6b9b62c980b70e229 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -2441,8 +2441,8 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch b/lophine-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch index 6d847c3..ee7e52f 100644 --- a/lophine-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch +++ b/lophine-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch @@ -7,7 +7,7 @@ License: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://github.com/GaleMC/Gale diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 1888210d014f9c00316059a7ccce086dfb0e3a0f..00bc928a19cb877698b34b7c039bee5fe8b5cda5 100644 +index 92cb0b1722bd5bcf9996c3f6b9b62c980b70e229..43e07a3c98e80f874f55411beac39e215ffdc3cf 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1302,8 +1302,17 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch b/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch index 457e838..add9435 100644 --- a/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch +++ b/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch @@ -137,7 +137,7 @@ index 2e71a1cbabf3405e3e4fd5349a1784d895e7e60c..42de919064680b1a464d813976ca5e69 if (!itemStack.isEmpty()) { slots.add(Pair.of(slot, itemStack.copy())); diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 093c48e2379c01f45277b88f6c1b19b107a46326..b4d8cc8b520266abe1921b5e990c34fce3f1d982 100644 +index 4397f77d0169a3eefd347d3097657de4f6d37ef8..42e09148519596f95fc9c9c63df9c87e6ece3102 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1424,7 +1424,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0084-Server-I18n.patch b/lophine-server/minecraft-patches/features/0084-Server-I18n.patch index 6880f58..05756ff 100644 --- a/lophine-server/minecraft-patches/features/0084-Server-I18n.patch +++ b/lophine-server/minecraft-patches/features/0084-Server-I18n.patch @@ -26,10 +26,10 @@ index 47cd33bce908744e64356b585853d6a8ecf82443..bb4011d3c6a1d2a5aa66e68fe719cd5e loadFromJson(stream, output); } catch (IOException | JsonParseException e) { diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java -index 2a75f8fbd2e5f41ca138740319d34683915e3b5b..0cc56b19d68f34994c9dbae578609eca7b7343cb 100644 +index a557d488e4e289a61aeb9aed0cc133a0a7ce8f8c..ca349619bcdd0682c9d66d54fc55cac268fc443b 100644 --- a/net/minecraft/server/Main.java +++ b/net/minecraft/server/Main.java -@@ -158,6 +158,8 @@ public class Main { +@@ -167,6 +167,8 @@ public class Main { return; } diff --git a/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch index 260b141..53943af 100644 --- a/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch +++ b/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable cross region damage trace diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index b4d8cc8b520266abe1921b5e990c34fce3f1d982..93c76c2faf75bf4901ecaba1e04d957d5ddddfca 100644 +index 42e09148519596f95fc9c9c63df9c87e6ece3102..444753590d3bc96ce68e25a3834d7abb86e20f94 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1448,6 +1448,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch b/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch index 3055778..208cf14 100644 --- a/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch +++ b/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch @@ -31,7 +31,7 @@ index 97c514673a454b752ab86b944fd143725ca8090d..ba91d40d6d91588a4b39abfefcb17a36 private final Reference2ReferenceOpenHashMap, Object> regionizedData = new Reference2ReferenceOpenHashMap<>(); diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 9800ae1d3c49800b0c7342d43d696109b5b72cf4..f9a8c79640ed6ca381e4482eaeab6b23db59419f 100644 +index c67ea715f02086e5a39cc5832ccdc0b32199db93..946094713bdb294d7d8beb03967b2a2488f5359b 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -299,7 +299,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch b/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch index f72b407..b1dcc5c 100644 --- a/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch +++ b/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable function command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index f9a8c79640ed6ca381e4482eaeab6b23db59419f..1b2d3e2c23e8e03ae25e85a60b6ef0528e627f61 100644 +index 946094713bdb294d7d8beb03967b2a2488f5359b..3d9e8c5ba567efd363e0ed54059f67fbfe25e361 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -217,7 +217,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch b/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch index 32a2e0f..ebae792 100644 --- a/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch +++ b/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable scoreboard command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 1b2d3e2c23e8e03ae25e85a60b6ef0528e627f61..916b5c8d524ffd7ccb953fe0f1cf020a1ea8dafb 100644 +index 3d9e8c5ba567efd363e0ed54059f67fbfe25e361..6642288dde528899d9bce7ccd8d92a199e8975c8 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -246,7 +246,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch b/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch index 907fca5..6ddf526 100644 --- a/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch +++ b/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable trigger command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 916b5c8d524ffd7ccb953fe0f1cf020a1ea8dafb..03f3fe221b14f0317947d74e25049bcce2ebeb66 100644 +index 6642288dde528899d9bce7ccd8d92a199e8975c8..77d7d83cc781baf19593227d20b827bf0be6ed28 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -274,7 +274,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch index 8ee4077..f0ff686 100644 --- a/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch +++ b/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch @@ -18,7 +18,7 @@ index 163999d50213e0167eb09f0eae883388849f28fa..5196431f52e81608a5575f8a262cd5c8 double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1); if (rangeY != -1) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 00bc928a19cb877698b34b7c039bee5fe8b5cda5..db7281fcf1f4dc878a87ef9b8f24f2f9da12238a 100644 +index 43e07a3c98e80f874f55411beac39e215ffdc3cf..cddf44f5da5cba5603dcff4913b4658dcfcc48db 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -164,7 +164,7 @@ public abstract class Entity @@ -30,7 +30,7 @@ index 00bc928a19cb877698b34b7c039bee5fe8b5cda5..db7281fcf1f4dc878a87ef9b8f24f2f9 // CraftBukkit start private static final int CURRENT_LEVEL = 2; static boolean isLevelAtLeast(ValueInput input, int level) { -@@ -6579,4 +6579,48 @@ public abstract class Entity +@@ -6590,4 +6590,48 @@ public abstract class Entity // Paper end public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG diff --git a/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch index 8ff1bae..9b1dd52 100644 --- a/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch +++ b/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 93c76c2faf75bf4901ecaba1e04d957d5ddddfca..2985d5e2dde049a999a39f6edbb6696332f6d822 100644 +index 444753590d3bc96ce68e25a3834d7abb86e20f94..e64db3045ebf08600283a47960005827c1920f94 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -245,6 +245,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch index 85e10dd..de3f04a 100644 --- a/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch +++ b/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch @@ -344,7 +344,7 @@ index cb11830c2f399c9706b20f8104686dc0d9b686f9..1c4c67410849f844946e4883585910fc ServerLevel.this.updateSleepingPlayerList(); } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 2985d5e2dde049a999a39f6edbb6696332f6d822..64943c193ae73795ddf8222a6f71ea5eb1705fe2 100644 +index e64db3045ebf08600283a47960005827c1920f94..a3d3a602ab86e27ae0c6e6207384dc0043279d47 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -232,7 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -377,7 +377,7 @@ index 2985d5e2dde049a999a39f6edbb6696332f6d822..64943c193ae73795ddf8222a6f71ea5e AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0); this.level() .getEntitiesOfClass(Mob.class, aabb, EntitySelector.NO_SPECTATORS) -@@ -2161,6 +2161,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2140,6 +2140,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.lastSentHealth = -1.0F; this.lastSentFood = -1; this.teleportSpectators(transition, oldLevel); @@ -542,7 +542,7 @@ index ca1e635b0fdf3d0d17447b43a558fe030536d297..ed50484ca24ef24b1e5bef9f6369dfa4 public @Nullable ServerPlayer getPlayer(final String playerName) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index db7281fcf1f4dc878a87ef9b8f24f2f9da12238a..b11637543c3ef8650ad5c65c2cab8a1cb6e95158 100644 +index cddf44f5da5cba5603dcff4913b4658dcfcc48db..9eaed81a330a22e7fd6585cd286ec61371e97272 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1263,7 +1263,7 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch index e0786b4..fe17947 100644 --- a/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch +++ b/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch @@ -98,7 +98,7 @@ index ae88e57974f631ff2494c35d6e02049ba5d38014..6b8073023833fc9e99684944802dc594 } } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 64943c193ae73795ddf8222a6f71ea5eb1705fe2..4034b4b9bd5e567b882169b5b1e17f75b64ba8db 100644 +index a3d3a602ab86e27ae0c6e6207384dc0043279d47..70f7cb6b38a90ca337bd52c18fa7bfd4016b552c 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1111,6 +1111,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -115,7 +115,7 @@ index 64943c193ae73795ddf8222a6f71ea5eb1705fe2..4034b4b9bd5e567b882169b5b1e17f75 CrashReport report = CrashReport.forThrowable(t, "Ticking player"); CrashReportCategory category = report.addCategory("Player being ticked"); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index b11637543c3ef8650ad5c65c2cab8a1cb6e95158..426e033e033147f5db6c2d9c96ab13af0fc553a8 100644 +index 9eaed81a330a22e7fd6585cd286ec61371e97272..acc9caf8559cd341ea17d3b58f13cdac7de18564 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1522,8 +1522,18 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0126-Carpet-features.patch b/lophine-server/minecraft-patches/features/0126-Carpet-features.patch index 22c63d1..4a22bff 100644 --- a/lophine-server/minecraft-patches/features/0126-Carpet-features.patch +++ b/lophine-server/minecraft-patches/features/0126-Carpet-features.patch @@ -128,7 +128,7 @@ index 8cc4fe9feb57902a4b9a6a26e6175ac00a2cef65..9ab1a812e43145120859734075e2ac99 // Paper start - fix converting txt to json file; moved from constructor } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4034b4b9bd5e567b882169b5b1e17f75b64ba8db..4c53b688ed6b26ca7231841f3235f9a824416bba 100644 +index 70f7cb6b38a90ca337bd52c18fa7bfd4016b552c..9a6f18fd0eb7e2aef174b25d14cfd0f5a3ade6af 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -260,6 +260,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -139,7 +139,7 @@ index 4034b4b9bd5e567b882169b5b1e17f75b64ba8db..4c53b688ed6b26ca7231841f3235f9a8 private @Nullable Vec3 startingToFallPosition; private @Nullable Vec3 enteredNetherPosition; private @Nullable Vec3 enteredLavaOnVehiclePosition; -@@ -2168,7 +2169,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2147,7 +2148,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.lastSentFood = -1; this.teleportSpectators(transition, oldLevel); // Leaves start - bot support @@ -148,7 +148,7 @@ index 4034b4b9bd5e567b882169b5b1e17f75b64ba8db..4c53b688ed6b26ca7231841f3235f9a8 this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(this, true)); // Leaves - render bot } // Leaves end - bot support -@@ -2805,6 +2806,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2784,6 +2785,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.setShoulderEntityRight(oldPlayer.getShoulderEntityRight()); this.setLastDeathLocation(oldPlayer.getLastDeathLocation()); this.waypointIcon().copyFrom(oldPlayer.waypointIcon()); @@ -160,7 +160,7 @@ index 4034b4b9bd5e567b882169b5b1e17f75b64ba8db..4c53b688ed6b26ca7231841f3235f9a8 } private void transferInventoryXpAndScore(final Player oldPlayer) { -@@ -3084,6 +3090,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -3063,6 +3069,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.particleStatus = information.particleStatus(); this.getEntityData().set(DATA_PLAYER_MODE_CUSTOMISATION, (byte)information.modelCustomisation()); this.getEntityData().set(DATA_PLAYER_MAIN_HAND, information.mainHand()); diff --git a/lophine-server/minecraft-patches/features/0127-Carpet-Features-Compatible.patch b/lophine-server/minecraft-patches/features/0127-Carpet-Features-Compatible.patch index 83023e1..29235ad 100644 --- a/lophine-server/minecraft-patches/features/0127-Carpet-Features-Compatible.patch +++ b/lophine-server/minecraft-patches/features/0127-Carpet-Features-Compatible.patch @@ -40,7 +40,7 @@ index 57a35d7a801621fc461e896eb2bba533d9d5bc1b..ae424c8931a2f82c6c8d4ddd8422a2c1 } // Luminol end - Add a config to enable tick command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 03f3fe221b14f0317947d74e25049bcce2ebeb66..6882e85fb6413e5c346c189a82b69f3e408aafba 100644 +index 77d7d83cc781baf19593227d20b827bf0be6ed28..82af03649c7537274aa54ed942e4aae589b97888 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -268,7 +268,7 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch b/lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch index d28e889..b67f7e8 100644 --- a/lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch +++ b/lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch @@ -21,10 +21,10 @@ index dd17339fe2f9d7660b20eed05b61d6231302aa82..d997e4f7ae6ee4e81f5fffe874f2895d } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4c53b688ed6b26ca7231841f3235f9a824416bba..cef9c7887332b91e2466a97a5250db81f7af0dcf 100644 +index 9a6f18fd0eb7e2aef174b25d14cfd0f5a3ade6af..b43bbe461500782a75a49c9238bd4d4d81448d09 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -2360,7 +2360,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -2339,7 +2339,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc public boolean isInvulnerableTo(final ServerLevel level, final DamageSource source) { // Paper start - disable player cramming return (super.isInvulnerableTo(level, source) || this.isChangingDimension() && !source.is(DamageTypes.ENDER_PEARL) || !this.connection.hasClientLoaded()) diff --git a/lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch b/lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch index b5d2984..7b55e47 100644 --- a/lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch +++ b/lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Restore vanilla ender pearl loading diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index cef9c7887332b91e2466a97a5250db81f7af0dcf..a17212c1910ce9490fe8df8c4ef507e25b89c545 100644 +index b43bbe461500782a75a49c9238bd4d4d81448d09..68e36ad03325cd6348dc4bbab37409b70bee6023 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -277,7 +277,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -51,7 +51,7 @@ index cef9c7887332b91e2466a97a5250db81f7af0dcf..a17212c1910ce9490fe8df8c4ef507e2 } } -@@ -3568,11 +3570,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -3547,11 +3549,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc } public void registerEnderPearl(final ThrownEnderpearl enderPearl) { @@ -89,7 +89,7 @@ index 516561a25d28f2c7bcc3e71c5f2f9da99c2899c3..eb652157ef25e83b897f52aff3c49c09 level.removePlayerImmediately(player, Entity.RemovalReason.UNLOADED_WITH_PLAYER); diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java -index 790c1bcf11150d31bf90c32345e4eb40de9a6a41..7409b452567608dbdb36ac686791e604a267fb6a 100644 +index 4df9a3356cfdee52761db47694e59779976840db..3e6844a468d8e6c9cf3b0bd23e21a3cabc9b7f51 100644 --- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java +++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java @@ -31,7 +31,11 @@ import net.minecraft.world.phys.Vec3; diff --git a/lophine-server/paper-patches/features/0022-Leaves-Leaves-Fakeplayer.patch b/lophine-server/paper-patches/features/0022-Leaves-Leaves-Fakeplayer.patch index 44024b4..8b7e501 100644 --- a/lophine-server/paper-patches/features/0022-Leaves-Leaves-Fakeplayer.patch +++ b/lophine-server/paper-patches/features/0022-Leaves-Leaves-Fakeplayer.patch @@ -148,10 +148,10 @@ index f5373786032b3f1db8e6c0c928c781998b2fe194..ca6be9faab3f93da7e91bf73997111b7 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 efcb8b97cd685e1243c770bf3e8daf03615abb1d..4722e027ed5869516adddf696ac030fd84df834d 100644 +index 00749be3b16fd09c6b952c93631c808ff5657f20..0f6378ca80bea5d4d7f1cb7d788a57390bc27c59 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 { +@@ -130,6 +130,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return new CraftHumanEntity(server, (net.minecraft.world.entity.player.Player) entity); } diff --git a/lophine-server/paper-patches/features/0023-Leaves-Replay-Mod-API.patch b/lophine-server/paper-patches/features/0023-Leaves-Replay-Mod-API.patch index 734d9f4..21db2fc 100644 --- a/lophine-server/paper-patches/features/0023-Leaves-Replay-Mod-API.patch +++ b/lophine-server/paper-patches/features/0023-Leaves-Replay-Mod-API.patch @@ -54,10 +54,10 @@ index 7fd08dac549261c50cf5723ef380ba90ea0da56f..7cfa9a5a1629c3af1e1105b137cbfc4c + // 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 4722e027ed5869516adddf696ac030fd84df834d..4d20f07ff4bf782e938ac990e2b9aaeb90b92db1 100644 +index 0f6378ca80bea5d4d7f1cb7d788a57390bc27c59..610e19b82919f05b0ebf20854e0f9b4a77a2b063 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 { +@@ -131,6 +131,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } if (entity instanceof org.leavesmc.leaves.bot.ServerBot bot) { return new org.leavesmc.leaves.entity.bot.CraftBot(server, bot); }