Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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: fc460d1b PR-735: Add Villager#zombify c8c8331e PR-690: Add method to read ItemStack input 62845f2f SPIGOT-6829: Add per-player world border API CraftBukkit Changes: a459f4d4 PR-1033: Add Villager#zombify d65d1430 PR-975: Add method to read ItemStack input b5559f8c SPIGOT-6990: Fix setRepairCost(0) in Anvil 6c308e1b SPIGOT-6829: Add per-player world border API Spigot Changes: 42b61526 SPIGOT-7000: Generation and /locate issues when using custom structure seeds
This commit is contained in:
parent
c6e631aacb
commit
1cfd363d32
263 changed files with 600 additions and 637 deletions
|
@ -16,10 +16,10 @@ intent to remove) and replace it with two new methods, clearly named and
|
|||
documented as to their purpose.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 295f597fb1ecf9210287d14837c286ae173655f1..7d9e65b073feb8ff473f23eaca88f20c0411d386 100644
|
||||
index 8bd1e1e521a56065b928b5b76b5fcfe1d9634565..78a37ed352f9ced438e576f09fb340bc5159ddec 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -220,6 +220,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -221,6 +221,7 @@ public class ServerPlayer extends Player {
|
||||
public int latency;
|
||||
public boolean wonGame;
|
||||
private int containerUpdateDelay; // Paper
|
||||
|
@ -106,10 +106,10 @@ index f6665825e62a0cd912e6b06df6d68795596486f0..1f2bc88d4570c6ef00e67a772b745e0b
|
|||
public Location getBedSpawnLocation() {
|
||||
CompoundTag data = this.getData();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index df7821d72094bfe2c781d87bc2bc816569f22c2e..3b26461e993207206bfbfd07a9e5ff04ed4460b4 100644
|
||||
index 84fc7688e5d9a86499a88484530f5b9623e8dc22..b15876756bf677611f29acefd18b490d333c6291 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -161,6 +161,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -171,6 +171,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
|
||||
private String resourcePackHash;
|
||||
private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
|
||||
|
@ -117,7 +117,7 @@ index df7821d72094bfe2c781d87bc2bc816569f22c2e..3b26461e993207206bfbfd07a9e5ff04
|
|||
// Paper end
|
||||
|
||||
public CraftPlayer(CraftServer server, ServerPlayer entity) {
|
||||
@@ -1576,6 +1577,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1662,6 +1663,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
this.firstPlayed = firstPlayed;
|
||||
}
|
||||
|
||||
|
@ -136,7 +136,7 @@ index df7821d72094bfe2c781d87bc2bc816569f22c2e..3b26461e993207206bfbfd07a9e5ff04
|
|||
public void readExtraData(CompoundTag nbttagcompound) {
|
||||
this.hasPlayedBefore = true;
|
||||
if (nbttagcompound.contains("bukkit")) {
|
||||
@@ -1598,6 +1611,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1684,6 +1697,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
|
||||
public void setExtraData(CompoundTag nbttagcompound) {
|
||||
|
@ -145,7 +145,7 @@ index df7821d72094bfe2c781d87bc2bc816569f22c2e..3b26461e993207206bfbfd07a9e5ff04
|
|||
if (!nbttagcompound.contains("bukkit")) {
|
||||
nbttagcompound.put("bukkit", new CompoundTag());
|
||||
}
|
||||
@@ -1612,6 +1627,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1698,6 +1713,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
data.putLong("firstPlayed", this.getFirstPlayed());
|
||||
data.putLong("lastPlayed", System.currentTimeMillis());
|
||||
data.putString("lastKnownName", handle.getScoreboardName());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue