Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

revert some stuff

Browse Source
This commit is contained in:
LegacyGamerHD
2021-02-04 09:14:28 +01:00
parent 21d24bdfa5
commit 433e18e7d2
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build.sh
View File

@@ -36,7 +36,7 @@ echo "[Akarin] Ready to build"
else else
rm -rf Paper-API/src rm -rf Paper-API/src
rm -rf Paper-Server/src rm -rf Paper-Server/src
./paper jar ./paper patch
\cp -rf "$basedir/sources/src" "$paperbasedir/Paper-Server/" \cp -rf "$basedir/sources/src" "$paperbasedir/Paper-Server/"
\cp -rf "$basedir/sources/pom.xml" "$paperbasedir/Paper-Server/" \cp -rf "$basedir/sources/pom.xml" "$paperbasedir/Paper-Server/"
mvn clean install mvn clean install

12
sources/pom.xml
View File

@@ -1,4 +1,4 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>akarin</artifactId> <artifactId>akarin</artifactId>
@@ -26,6 +26,7 @@
</parent> </parent>
<dependencies> <dependencies>
<!-- bugfixes (netty#6607) -->
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
@@ -42,7 +43,7 @@
<groupId>com.destroystokyo.paper</groupId> <groupId>com.destroystokyo.paper</groupId>
<artifactId>paper</artifactId> <artifactId>paper</artifactId>
<version>${minecraft.version}-R0.1-SNAPSHOT</version> <version>${minecraft.version}-R0.1-SNAPSHOT</version>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.jopt-simple</groupId> <groupId>net.sf.jopt-simple</groupId>
@@ -68,6 +69,7 @@
<version>3.0.3</version> <version>3.0.3</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.minecrell</groupId> <groupId>net.minecrell</groupId>
<artifactId>terminalconsoleappender</artifactId> <artifactId>terminalconsoleappender</artifactId>
@@ -118,7 +120,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.13.1</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -128,7 +130,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Akarin --> <!-- Akarin -->
<dependency> <dependency>
<groupId>io.akarin</groupId> <groupId>io.akarin</groupId>
<artifactId>legacylauncher</artifactId> <artifactId>legacylauncher</artifactId>
@@ -182,7 +184,7 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<!-- This builds a completely 'ready to start' jar with all dependencies inside --> <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build> <build>
<finalName>akarin-${minecraft.version}</finalName> <finalName>akarin-${minecraft.version}</finalName>
<defaultGoal>clean install</defaultGoal> <!-- Paper --> <defaultGoal>clean install</defaultGoal> <!-- Paper -->

6
sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java
View File

@@ -60,12 +60,12 @@ public abstract class MixinMinecraftServer {
)) ))
private void prerun(CallbackInfo info) { private void prerun(CallbackInfo info) {
primaryThread.setPriority(AkarinGlobalConfig.primaryThreadPriority < Thread.NORM_PRIORITY ? Thread.NORM_PRIORITY : 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())); 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); 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(); AkarinSlackScheduler.get().boot();
} }