Add changes note for direct-overwrited classes w/ Puts a conflict stuff back
This commit is contained in:
@@ -31,6 +31,14 @@ import org.bukkit.Bukkit;
|
|||||||
|
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <b>Akarin Changes Note</b><br>
|
||||||
|
* <br>
|
||||||
|
* 1) Add volatile to fields<br>
|
||||||
|
* 2) Capable to silent async timing error<br>
|
||||||
|
* 3) Better handle sync stop by avoid double thread checking
|
||||||
|
* @author cakoyo
|
||||||
|
*/
|
||||||
class TimingHandler implements Timing {
|
class TimingHandler implements Timing {
|
||||||
|
|
||||||
private static int idPool = 1;
|
private static int idPool = 1;
|
||||||
|
|||||||
@@ -192,9 +192,7 @@ public class MixinMinecraftServer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void tickConflictSync(WorldServer world) {
|
public void tickConflictSync(WorldServer world) {
|
||||||
world.timings.doChunkMap.startTiming();
|
;
|
||||||
world.manager.flush();
|
|
||||||
world.timings.doChunkMap.stopTiming();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,12 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
|||||||
import org.bukkit.inventory.MainHand;
|
import org.bukkit.inventory.MainHand;
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <b>Akarin Changes Note</b><br>
|
||||||
|
* <br>
|
||||||
|
* 1) Add volatile to fields<br>
|
||||||
|
* @author cakoyo
|
||||||
|
*/
|
||||||
public class EntityPlayer extends EntityHuman implements ICrafting {
|
public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
|
|
||||||
private static final Logger bV = LogManager.getLogger();
|
private static final Logger bV = LogManager.getLogger();
|
||||||
|
|||||||
@@ -29,6 +29,14 @@ import org.apache.logging.log4j.Logger;
|
|||||||
import org.apache.logging.log4j.Marker;
|
import org.apache.logging.log4j.Marker;
|
||||||
import org.apache.logging.log4j.MarkerManager;
|
import org.apache.logging.log4j.MarkerManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <b>Akarin Changes Note</b><br>
|
||||||
|
* <br>
|
||||||
|
* 1) Add volatile to fields<br>
|
||||||
|
* 2) Expose private members<br>
|
||||||
|
* 3) Change writeLock back to readLock (Paper Anti-XRay modification) by integrating checks
|
||||||
|
* @author cakoyo
|
||||||
|
*/
|
||||||
public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
||||||
|
|
||||||
private static final Logger g = LogManager.getLogger();
|
private static final Logger g = LogManager.getLogger();
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
package net.minecraft.server;
|
package net.minecraft.server;
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.common.primitives.Doubles;
|
import com.google.common.primitives.Doubles;
|
||||||
import com.google.common.primitives.Floats;
|
import com.google.common.primitives.Floats;
|
||||||
import com.google.common.util.concurrent.Futures;
|
|
||||||
import io.netty.util.concurrent.Future;
|
import io.netty.util.concurrent.Future;
|
||||||
import io.netty.util.concurrent.GenericFutureListener;
|
import io.netty.util.concurrent.GenericFutureListener;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@@ -61,6 +58,15 @@ import com.destroystokyo.paper.event.player.PlayerJumpEvent; // Paper
|
|||||||
import co.aikar.timings.MinecraftTimings; // Paper
|
import co.aikar.timings.MinecraftTimings; // Paper
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <b>Akarin Changes Note</b><br>
|
||||||
|
* <br>
|
||||||
|
* 1) Add volatile to fields<br>
|
||||||
|
* 2) Expose private members<br>
|
||||||
|
* 3) Migrated keep alive packet handling to service thread<br>
|
||||||
|
* 4) Use currentMillis() instead of nanoTime() / 1000000
|
||||||
|
* @author cakoyo
|
||||||
|
*/
|
||||||
public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
@@ -1147,11 +1153,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|||||||
// CraftBukkit start - Rarely it would send a disconnect line twice
|
// CraftBukkit start - Rarely it would send a disconnect line twice
|
||||||
if (this.processedDisconnect) {
|
if (this.processedDisconnect) {
|
||||||
return;
|
return;
|
||||||
// Akarin start - move to NetworkManager
|
}else {
|
||||||
} // else {
|
this.processedDisconnect = true;
|
||||||
// this.processedDisconnect = true;
|
}
|
||||||
// }
|
|
||||||
// Akarin end
|
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
PlayerConnection.LOGGER.info("{} lost connection: {}", this.player.getName(), ichatbasecomponent.toPlainText());
|
PlayerConnection.LOGGER.info("{} lost connection: {}", this.player.getName(), ichatbasecomponent.toPlainText());
|
||||||
// CraftBukkit start - Replace vanilla quit message handling with our own.
|
// CraftBukkit start - Replace vanilla quit message handling with our own.
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user