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

Missing overwrite annotation

Browse Source
This commit is contained in:
Sotr
2018-07-23 19:18:22 +08:00
parent 528ab01026
commit 2ace17105f
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,8 @@ import java.util.Queue;
import java.util.concurrent.ExecutorCompletionService; import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask; import java.util.concurrent.FutureTask;
import org.bukkit.World;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor; import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor;
import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.event.inventory.InventoryMoveItemEvent;
@@ -197,8 +199,9 @@ public abstract class MixinMinecraftServer {
Akari.worldTiming.startTiming(); Akari.worldTiming.startTiming();
if (AkarinGlobalConfig.legacyWorldTimings) { if (AkarinGlobalConfig.legacyWorldTimings) {
for (int i = 0; i < worlds.size(); ++i) { for (int i = 0; i < worlds.size(); ++i) {
worlds.get(i).timings.tickEntities.startTiming(); WorldServer world = worlds.get(i);
worlds.get(i).timings.doTick.startTiming(); world.timings.tickEntities.startTiming();
world.timings.doTick.startTiming();
} }
} }
Akari.STAGE_TICK.submit(() -> { Akari.STAGE_TICK.submit(() -> {
@@ -226,8 +229,9 @@ public abstract class MixinMinecraftServer {
Akari.worldTiming.stopTiming(); Akari.worldTiming.stopTiming();
if (AkarinGlobalConfig.legacyWorldTimings) { if (AkarinGlobalConfig.legacyWorldTimings) {
for (int i = 0; i < worlds.size(); ++i) { for (int i = 0; i < worlds.size(); ++i) {
worlds.get(i).timings.tickEntities.stopTiming(); WorldServer world = worlds.get(i);
worlds.get(i).timings.doTick.stopTiming(); world.timings.tickEntities.stopTiming();
world.timings.doTick.stopTiming();
} }
} }

2
sources/src/main/java/io/akarin/server/mixin/core/MixinWorld.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.server.AxisAlignedBB; import net.minecraft.server.AxisAlignedBB;
@@ -21,6 +22,7 @@ public abstract class MixinWorld {
/** /**
* Returns true if there are no solid, live entities in the specified AxisAlignedBB, excluding the given entity * Returns true if there are no solid, live entities in the specified AxisAlignedBB, excluding the given entity
*/ */
@Overwrite
public boolean a(AxisAlignedBB box, @Nullable Entity target) { // PAIL: checkNoEntityCollision public boolean a(AxisAlignedBB box, @Nullable Entity target) { // PAIL: checkNoEntityCollision
List<Entity> list = this.getEntities(null, box); List<Entity> list = this.getEntities(null, box);

5
sources/src/main/java/io/akarin/server/mixin/core/MixinWorldServer.java
View File

@@ -4,7 +4,6 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import io.akarin.api.internal.Akari;
import io.akarin.api.internal.mixin.IMixinLockProvider; import io.akarin.api.internal.mixin.IMixinLockProvider;
import net.minecraft.server.WorldServer; import net.minecraft.server.WorldServer;
@@ -14,9 +13,7 @@ public abstract class MixinWorldServer implements IMixinLockProvider {
value = "INVOKE", value = "INVOKE",
target = "net/minecraft/server/PlayerChunkMap.flush()V" target = "net/minecraft/server/PlayerChunkMap.flush()V"
)) ))
public void onFlush() { public void onFlush() {} // Migrated to main thread
Akari.logger.warn("Cancelled");
} // Migrated to main thread
private final Object tickLock = new Object(); private final Object tickLock = new Object();