geforkt von Mirrors/Paper
Update to Minecraft 1.20.1
By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
Ursprung
746a0db582
Commit
f40eac90a3
@ -1,14 +1,14 @@
|
|||||||
--- a/net/minecraft/network/NetworkManager.java
|
--- a/net/minecraft/network/NetworkManager.java
|
||||||
+++ b/net/minecraft/network/NetworkManager.java
|
+++ b/net/minecraft/network/NetworkManager.java
|
||||||
@@ -86,6 +86,7 @@
|
@@ -88,6 +88,7 @@
|
||||||
private float averageSentPackets;
|
|
||||||
private int tickCount;
|
|
||||||
private boolean handlingFault;
|
private boolean handlingFault;
|
||||||
|
@Nullable
|
||||||
|
private volatile IChatBaseComponent delayedDisconnect;
|
||||||
+ public String hostname = ""; // CraftBukkit - add field
|
+ public String hostname = ""; // CraftBukkit - add field
|
||||||
|
|
||||||
public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
|
public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
|
||||||
this.receiving = enumprotocoldirection;
|
this.receiving = enumprotocoldirection;
|
||||||
@@ -167,7 +168,7 @@
|
@@ -173,7 +174,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private static <T extends PacketListener> void genericsFtw(Packet<T> packet, PacketListener packetlistener) {
|
private static <T extends PacketListener> void genericsFtw(Packet<T> packet, PacketListener packetlistener) {
|
||||||
@ -17,10 +17,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setListener(PacketListener packetlistener) {
|
public void setListener(PacketListener packetlistener) {
|
||||||
@@ -296,7 +297,7 @@
|
@@ -306,7 +307,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
public void disconnect(IChatBaseComponent ichatbasecomponent) {
|
if (this.isConnected()) {
|
||||||
if (this.channel.isOpen()) {
|
|
||||||
- this.channel.close().awaitUninterruptibly();
|
- this.channel.close().awaitUninterruptibly();
|
||||||
+ this.channel.close(); // We can't wait as this may be called from an event loop.
|
+ this.channel.close(); // We can't wait as this may be called from an event loop.
|
||||||
this.disconnectedReason = ichatbasecomponent;
|
this.disconnectedReason = ichatbasecomponent;
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
public abstract class PlayerList {
|
public abstract class PlayerList {
|
||||||
|
|
||||||
public static final File USERBANLIST_FILE = new File("banned-players.json");
|
public static final File USERBANLIST_FILE = new File("banned-players.json");
|
||||||
@@ -119,32 +139,44 @@
|
@@ -119,14 +139,16 @@
|
||||||
private static final int SEND_PLAYER_INFO_INTERVAL = 600;
|
private static final int SEND_PLAYER_INFO_INTERVAL = 600;
|
||||||
private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
|
private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
|
||||||
private final MinecraftServer server;
|
private final MinecraftServer server;
|
||||||
@ -47,12 +47,7 @@
|
|||||||
public final WorldNBTStorage playerIo;
|
public final WorldNBTStorage playerIo;
|
||||||
private boolean doWhiteList;
|
private boolean doWhiteList;
|
||||||
private final LayeredRegistryAccess<RegistryLayer> registries;
|
private final LayeredRegistryAccess<RegistryLayer> registries;
|
||||||
private final IRegistryCustom.Dimension synchronizedRegistries;
|
@@ -138,13 +160,23 @@
|
||||||
- protected final int maxPlayers;
|
|
||||||
+ public int maxPlayers;
|
|
||||||
private int viewDistance;
|
|
||||||
private int simulationDistance;
|
|
||||||
private boolean allowCheatsForAllPlayers;
|
|
||||||
private static final boolean ALLOW_LOGOUTIVATOR = false;
|
private static final boolean ALLOW_LOGOUTIVATOR = false;
|
||||||
private int sendAllPlayerInfoIn;
|
private int sendAllPlayerInfoIn;
|
||||||
|
|
||||||
|
@ -67,15 +67,6 @@
|
|||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
public static final String ID_TAG = "id";
|
public static final String ID_TAG = "id";
|
||||||
public static final String PASSENGERS_TAG = "Passengers";
|
public static final String PASSENGERS_TAG = "Passengers";
|
||||||
@@ -190,7 +248,7 @@
|
|
||||||
public boolean noPhysics;
|
|
||||||
protected final RandomSource random;
|
|
||||||
public int tickCount;
|
|
||||||
- public int remainingFireTicks;
|
|
||||||
+ private int remainingFireTicks;
|
|
||||||
public boolean wasTouchingWater;
|
|
||||||
protected Object2DoubleMap<TagKey<FluidType>> fluidHeight;
|
|
||||||
protected boolean wasEyeInWater;
|
|
||||||
@@ -240,6 +298,25 @@
|
@@ -240,6 +298,25 @@
|
||||||
public boolean hasVisualFire;
|
public boolean hasVisualFire;
|
||||||
@Nullable
|
@Nullable
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>craftbukkit</artifactId>
|
<artifactId>craftbukkit</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>1.20-R0.1-SNAPSHOT</version>
|
<version>1.20.1-R0.1-SNAPSHOT</version>
|
||||||
<name>CraftBukkit</name>
|
<name>CraftBukkit</name>
|
||||||
<url>https://www.spigotmc.org/</url>
|
<url>https://www.spigotmc.org/</url>
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public String getMappingsVersion() {
|
public String getMappingsVersion() {
|
||||||
return "34f399b4f2033891290b7f0700e9e47b";
|
return "bcf3dcb22ad42792794079f9443df2c0";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren