Upstream Paper

This commit is contained in:
Sotr
2018-08-14 18:25:15 +08:00
parent 2593ab8eba
commit ef0ce05cae
3 changed files with 7 additions and 3 deletions

View File

@@ -18,6 +18,8 @@ import org.apache.logging.log4j.Logger;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -2060,7 +2062,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
public void a(PacketPlayInWindowClick packetplayinwindowclick) {
Bukkit.getLogger().info("Current thread: " + Thread.currentThread().getName());
PlayerConnectionUtils.ensureMainThread(packetplayinwindowclick, this, this.player.getWorldServer());
Bukkit.getLogger().info("Current thread (ensured): " + Thread.currentThread().getName());
if (this.player.isFrozen()) return; // CraftBukkit
this.player.resetIdleTimer();
if (this.player.activeContainer.windowId == packetplayinwindowclick.b() && this.player.activeContainer.c(this.player) && this.player.activeContainer.canUse(this.player)) { // CraftBukkit

View File

@@ -73,7 +73,7 @@ public interface EventExecutor {
if (!eventClass.isInstance(event)) return;
try {
// Akarin start
if (AkarinGlobalConfig.parallelMode != -1) {
if (false && AkarinGlobalConfig.parallelMode != -1) {
Akari.eventSuspendTiming.startTiming();
Akari.timingsLock.lock();
Akari.STAGE_TICK.suspend();
@@ -82,7 +82,7 @@ public interface EventExecutor {
// Akarin end
asmExecutor.execute(listener, event);
// Akarin start
if (AkarinGlobalConfig.parallelMode != -1) {
if (false && AkarinGlobalConfig.parallelMode != -1) {
Akari.eventResumeTiming.startTiming();
Akari.STAGE_TICK.resume();
Akari.timingsLock.unlock();