diff --git a/scripts/build.sh b/scripts/build.sh index 7ad7da534..af1770929 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -36,7 +36,7 @@ echo "[Akarin] Ready to build" else rm -rf Paper-API/src rm -rf Paper-Server/src - ./paper jar + ./paper patch \cp -rf "$basedir/sources/src" "$paperbasedir/Paper-Server/" \cp -rf "$basedir/sources/pom.xml" "$paperbasedir/Paper-Server/" mvn clean install @@ -51,4 +51,4 @@ echo "[Akarin] Ready to build" echo "[Akarin] Migrated final jar to $basedir/akarin-$minecraftversion.jar" ) -) +) \ No newline at end of file diff --git a/sources/pom.xml b/sources/pom.xml index f02408fff..c196bc9d5 100644 --- a/sources/pom.xml +++ b/sources/pom.xml @@ -1,4 +1,4 @@ - 4.0.0 akarin @@ -18,7 +18,7 @@ 1.8 1.8 - + com.destroystokyo.paper paper-parent @@ -26,6 +26,7 @@ + io.netty netty-all @@ -42,7 +43,7 @@ com.destroystokyo.paper paper ${minecraft.version}-R0.1-SNAPSHOT - compile + provided net.sf.jopt-simple @@ -68,6 +69,7 @@ 3.0.3 compile + net.minecrell terminalconsoleappender @@ -105,7 +107,7 @@ log4j-iostreams 2.8.1 - + com.lmax @@ -118,7 +120,7 @@ junit junit - 4.13.1 + 4.12 test @@ -127,13 +129,13 @@ 1.3 test - - + + io.akarin legacylauncher 1.26 - + org.spongepowered mixin @@ -182,7 +184,7 @@ - + akarin-${minecraft.version} clean install diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java index 7a7cdb5b7..f5daa7e2a 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java @@ -60,12 +60,12 @@ public abstract class MixinMinecraftServer { )) private void prerun(CallbackInfo info) { primaryThread.setPriority(AkarinGlobalConfig.primaryThreadPriority < Thread.NORM_PRIORITY ? Thread.NORM_PRIORITY : - (AkarinGlobalConfig.primaryThreadPriority > Thread.MAX_PRIORITY ? 10 : AkarinGlobalConfig.primaryThreadPriority)); + (AkarinGlobalConfig.primaryThreadPriority > Thread.MAX_PRIORITY ? 10 : AkarinGlobalConfig.primaryThreadPriority)); Akari.resizeTickExecutors((cachedWorldSize = worlds.size())); - for (int i = 0; i < worlds.size(); ++i) { + for (int i = 0; i < worlds.size(); ++i) { WorldServer world = worlds.get(i); - // TileEntityHopper.skipHopperEvents = world.paperConfig.disableHopperMoveEvents || InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; + TileEntityHopper.skipHopperEvents = world.paperConfig.disableHopperMoveEvents || InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; } AkarinSlackScheduler.get().boot(); }