Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
f4e3b4e439
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 5b680f0b Note maximum objective score length in documentation CraftBukkit Changes:5932f8a7Load default world spawn areas in consistent order3a5dc78fFix confusing migration message appearing on fresh server516a408fRemove redundant CraftBukkit change for secondary world data73a2c749Process conversation input on the main thread.100c3f07Cap Objective Score Length6e842759Cross World Entity Teleportation7deba1c6Check for blank OfflinePlayer Namesf2746a5eDescriptive kick reasons instead of Nope!b0212308Cap Channel Registrationsa610dcd8Identify CraftScheduler threads with useful names Spigot Changes: 19c3c5a5 Rebuild patches
37 Zeilen
1.5 KiB
Diff
37 Zeilen
1.5 KiB
Diff
From 4f9dbd3826230f993a06c40767d034469e6f62e7 Mon Sep 17 00:00:00 2001
|
|
From: Alfie Cleveland <alfeh@me.com>
|
|
Date: Tue, 27 Dec 2016 01:57:57 +0000
|
|
Subject: [PATCH] Properly fix item duplication bug
|
|
|
|
Credit to prplz for figuring out the real issue
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index a37af03d2..cd488d37f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1554,7 +1554,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
|
|
@Override
|
|
protected boolean isFrozen() {
|
|
- return super.isFrozen() || !getBukkitEntity().isOnline();
|
|
+ return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 1fcd2ab0e..2048ef89f 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -2499,7 +2499,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
}
|
|
|
|
public final boolean isDisconnected() {
|
|
- return !this.player.joining && !this.networkManager.isConnected();
|
|
+ return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper
|
|
}
|
|
// CraftBukkit end
|
|
}
|
|
--
|
|
2.20.1
|
|
|