Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
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:
1cb03826 SPIGOT-5900: Re-order Material enum entries to match Minecraft's order
fdd705db #507: Add hasDiscoveredRecipe() and getDiscoveredRecipes()

CraftBukkit Changes:
551e770f5 SPIGOT-5900: Add test for the order of Material enum entries
8297676c2 #682: Add hasDiscoveredRecipe() and getDiscoveredRecipes()
This commit is contained in:
Aikar 2020-07-01 19:41:58 -04:00
parent 75645fbfbf
commit 0823d3fdce
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
33 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 19424479caead7adb966746a70de34d9684f37bc..72ec97f5dcdf0e181e75b28f4de19b307835cb02 100644
index abe3d91428c4a5f7e3c6fec51faf973b76896dc3..babda8f047ab134223651ddcc8e4eb8d6682a031 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -299,6 +299,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -300,6 +300,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
*/
public int getExpToLevel();

4
Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add method to open already placed sign
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 72ec97f5dcdf0e181e75b28f4de19b307835cb02..863cdf7408cb6b42e7927505e34a2a93017e06ff 100644
index babda8f047ab134223651ddcc8e4eb8d6682a031..dd7b08f985d8ac41fdce8241a3cd2c84c1555ab3 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -443,4 +443,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -461,4 +461,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
*/
@Deprecated
public void setShoulderEntityRight(@Nullable Entity entity);

4
Spigot-API-Patches/0116-InventoryCloseEvent-Reason-API.patch
View File

@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers
to "confirm" things based on if it was player triggered close or not.
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 863cdf7408cb6b42e7927505e34a2a93017e06ff..1f94cbee36b6a952b2ecca8efbeaf7deee640a81 100644
index dd7b08f985d8ac41fdce8241a3cd2c84c1555ab3..2668196e04a7de245c63b4b74f0d056784ef0736 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -153,6 +153,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
*/
public void closeInventory();

4
Spigot-API-Patches/0153-Material-API-additions.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index c7316bd2ef89e63ced9f8d37f0936f1551c1157d..769c65e7928be5e0a15e592c874fc68cc6d30148 100644
index cedb719856573a9284443626d8823201125c895d..3a8438fb674006a5cbfd977a1cd016117691f0ee 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -85,6 +85,7 @@ import org.jetbrains.annotations.Nullable;
@ -15,7 +15,7 @@ index c7316bd2ef89e63ced9f8d37f0936f1551c1157d..769c65e7928be5e0a15e592c874fc68c
+@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed">
ACACIA_BOAT(27326, 1),
AIR(9648, 0),
@@ -3563,6 +3564,22 @@ public enum Material implements Keyed {
}
}

4
Spigot-API-Patches/0206-Potential-bed-API.patch
View File

@ -8,10 +8,10 @@ Adds a new method to fetch the location of a player's bed without generating any
getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index 1f94cbee36b6a952b2ecca8efbeaf7deee640a81..e6cdd4bc2d934ab932651e17f144d7004835bdc3 100644
index 2668196e04a7de245c63b4b74f0d056784ef0736..d3998c61af0c5fb1189ae7829e8cdfbef0cd3f97 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -239,6 +239,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -240,6 +240,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
*/
public int getSleepTicks();

4
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -1963,10 +1963,10 @@ index 7f435847ac1d13756ce233e7d5ae13f9dc17c443..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index aef9854bef327d5eb9513f486e6a05c65f2a6ee7..110b3d8aeae9b9443e4e59d456603eb9cb858583 100644
index b00c75bad4bb0fc51c40ab9cbdd611610a6315c0..e0c097a789d2110da609c1410a2f542a931e85e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1757,6 +1757,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1772,6 +1772,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
}

4
Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
View File

@ -119,10 +119,10 @@ index 4f7dc23d67e97f9a2b8983750299fc43b0ed6db9..a4a48dbee002e96a5644d9a033f9f233
public void c() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 110b3d8aeae9b9443e4e59d456603eb9cb858583..32f55645c14d5f25235a2e1efbbc8260bf1972f7 100644
index e0c097a789d2110da609c1410a2f542a931e85e9..ca7fa1ee3ebddb8e395395fcce35059f2e0ee52a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1669,7 +1669,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1684,7 +1684,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
return getHandle().locale;

4
Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 32f55645c14d5f25235a2e1efbbc8260bf1972f7..b2f9f4e9350cde9c79801b83e43c181c31f90131 100644
index ca7fa1ee3ebddb8e395395fcce35059f2e0ee52a..57eb0223477f44e061e916b0c046bdd136de1c0e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1355,12 +1355,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1370,12 +1370,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setFlying(boolean value) {

4
Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch
View File

@ -52,7 +52,7 @@ index 3a6e780007bc1b1fa799166daa01d3a9e15c7ab0..535056c64ef866e645b1bfbd149b50c5
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b2f9f4e9350cde9c79801b83e43c181c31f90131..fea541b287d3d4bd4a79d5058685cbd8d02768a5 100644
index 57eb0223477f44e061e916b0c046bdd136de1c0e..01f7d2ac7d4fb639ed9561c25777dea65210e050 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,6 @@
@ -62,7 +62,7 @@ index b2f9f4e9350cde9c79801b83e43c181c31f90131..fea541b287d3d4bd4a79d5058685cbd8
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding;
@@ -213,6 +214,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -215,6 +216,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}

4
Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch
View File

@ -30,10 +30,10 @@ index cd47a4ca069df26969de3051c2aac80540093818..abbf59bb91021821876a8960e8f77fac
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fea541b287d3d4bd4a79d5058685cbd8d02768a5..0f6d0c078c1280676dcd0be2c7c61942109fb822 100644
index 01f7d2ac7d4fb639ed9561c25777dea65210e050..a7526e8f5e2fe3b22133181659be791acbc05d57 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -762,7 +762,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -764,7 +764,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (fromWorld == toWorld) {
entity.playerConnection.teleport(to);
} else {

6
Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
View File

@ -22,10 +22,10 @@ index 8ecca907357119ed8eb67381914daba4ae6db38f..ffed0587323dbf522e478f43948bbb03
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0f6d0c078c1280676dcd0be2c7c61942109fb822..9ff3e95210322829342c1d9f9ad94edeae731ca2 100644
index a7526e8f5e2fe3b22133181659be791acbc05d57..109139673561175819821ff992d0d8846878b91a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -136,6 +136,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -138,6 +138,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private double health = 20;
private boolean scaledHealth = false;
private double healthScale = 20;
@ -36,7 +36,7 @@ index 0f6d0c078c1280676dcd0be2c7c61942109fb822..9ff3e95210322829342c1d9f9ad94ede
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1773,6 +1777,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1788,6 +1792,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean getAffectsSpawning() {
return this.getHandle().affectsSpawning;
}

4
Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View File

@ -44,10 +44,10 @@ index f1080e7d10d5105e3f4010489393f6150c7c4a75..374e4a3dcb656d6a84e05bb9260d3198
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9ff3e95210322829342c1d9f9ad94edeae731ca2..1f4ad48dc8299681c7231c126cc59c1a1bca99f3 100644
index 109139673561175819821ff992d0d8846878b91a..3d28ed4de1956d5ca7d11b63934a2bc174ef9d76 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1590,6 +1590,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1605,6 +1605,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setRealHealth(double health) {

4
Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
SPIGOT-1915 & GH-114
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1f4ad48dc8299681c7231c126cc59c1a1bca99f3..051ba43e9ed9afe77b74ffbede44def35601afc9 100644
index 3d28ed4de1956d5ca7d11b63934a2bc174ef9d76..0654819e8fbbe923b1aa439983af020dc39c6734 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -771,6 +771,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -773,6 +773,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return true;
}

4
Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch
View File

@ -40,10 +40,10 @@ index 7eb56761d9073156b30d4c981dcd4b4ba646f0bc..ab89e508ee8b8142fb7c0b5101b0b0e1
this.cg = packetplayinsettings.e();
this.getDataWatcher().set(EntityPlayer.bp, (byte) packetplayinsettings.f());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 051ba43e9ed9afe77b74ffbede44def35601afc9..1a7b9325108342cfbb781665ff1bf3ee3056bc9b 100644
index 0654819e8fbbe923b1aa439983af020dc39c6734..f8e141190c43bf9be1a7d782e8a22d74c5dedd95 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1776,8 +1776,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1791,8 +1791,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {

4
Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch
View File

@ -18,10 +18,10 @@ index 275c1d2d1eb2649de9a9b5aece6e88c21362efba..d72ba7f76c42fd525a5b59a999a0c08e
public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> a() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1a7b9325108342cfbb781665ff1bf3ee3056bc9b..8776cfb8b5eda0b407af031747688e582c0c2bff 100644
index f8e141190c43bf9be1a7d782e8a22d74c5dedd95..bcf855b549e24929865ce4ca32ce15975b06f951 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -219,6 +219,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -221,6 +221,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start

4
Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch
View File

@ -58,10 +58,10 @@ index 0dc2ffcfceeffed2cb949d31c4f976bce639f110..69c0a4c7bfb1c753d544dcd074ad832d
@Override
public abstract boolean isSpectator();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index fdebdf85c4a9e560c964de54e6ca726847ba0f11..30ba0a6aa2fd8c281f1129ad3098ee1033c32f8c 100644
index 60ef17fdb179c3236b8c9d196a17d719d5261fb4..1f715fb44b85f14664affcce9a11928dfc82991b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -486,6 +486,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -487,6 +487,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
getHandle().getCooldownTracker().setCooldown(CraftMagicNumbers.getItem(material), ticks);
}

4
Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch
View File

@ -103,10 +103,10 @@ index 4f008e4723d2cb0bcabb2d5621203d63c40c4923..8545146fb1f093f821e3b966d9337049
return this.a;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8776cfb8b5eda0b407af031747688e582c0c2bff..cc920cb20a7c1c77257e0219137775b362dfe602 100644
index bcf855b549e24929865ce4ca32ce15975b06f951..30f15491e6b18f51df9ccfc9b140251ba9ece400 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -186,6 +186,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -188,6 +188,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}

4
Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch
View File

@ -43,10 +43,10 @@ index e7fb982913f391bafd608c4626086cd9cab7fad7..7f2d8de12473c5413bbfc10ea0947d6a
return i * 2;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cc920cb20a7c1c77257e0219137775b362dfe602..0857e46a3b1e5cfa59907f092d0b174745c2c558 100644
index 30f15491e6b18f51df9ccfc9b140251ba9ece400..7374bd398e89cbaa6670e726a11aec9be78ba1c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1058,8 +1058,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1073,8 +1073,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
}

8
Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
View File

@ -48,7 +48,7 @@ index 80a21dbc05ed3007f2e827f7a320131244c3044b..e0f0a1e91a037f93b239e779aa8fd92b
uniqueId = i.getId();
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0857e46a3b1e5cfa59907f092d0b174745c2c558..04d6c2160aa13a8158cd4a3cffa9e1d2d5addb08 100644
index 7374bd398e89cbaa6670e726a11aec9be78ba1c3..816325719eb6150a300bb0d9193928cddf530ecd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,6 +1,8 @@
@ -68,7 +68,7 @@ index 0857e46a3b1e5cfa59907f092d0b174745c2c558..04d6c2160aa13a8158cd4a3cffa9e1d2
import net.minecraft.server.MapIcon;
import net.minecraft.server.MinecraftKey;
import net.minecraft.server.NBTTagCompound;
@@ -1216,8 +1219,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1231,8 +1234,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
// Remove this player from the hidden player's EntityTrackerEntry
@ -83,7 +83,7 @@ index 0857e46a3b1e5cfa59907f092d0b174745c2c558..04d6c2160aa13a8158cd4a3cffa9e1d2
PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
if (entry != null) {
entry.clear(getHandle());
@@ -1258,8 +1266,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1273,8 +1281,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
hiddenPlayers.remove(player.getUniqueId());
@ -98,7 +98,7 @@ index 0857e46a3b1e5cfa59907f092d0b174745c2c558..04d6c2160aa13a8158cd4a3cffa9e1d2
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
@@ -1268,6 +1281,50 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1283,6 +1296,50 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(getHandle());
}
}

6
Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
View File

@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
provide an optional flag to disable this check, at your own risk.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 04d6c2160aa13a8158cd4a3cffa9e1d2d5addb08..6270010f04a51c3bc5d434e617eb755daba59cb4 100644
index 816325719eb6150a300bb0d9193928cddf530ecd..3d1c26cd9a8917b223736bcc9c8000b0f8b46a64 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -142,6 +142,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -144,6 +144,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper start
private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
private String resourcePackHash;
@ -20,7 +20,7 @@ index 04d6c2160aa13a8158cd4a3cffa9e1d2d5addb08..6270010f04a51c3bc5d434e617eb755d
// Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
@@ -1487,7 +1488,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1502,7 +1503,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

4
Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add method to open already placed sign
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 30ba0a6aa2fd8c281f1129ad3098ee1033c32f8c..27b2ee740a705238995dd3bcea62b4bf74ec82dc 100644
index 1f715fb44b85f14664affcce9a11928dfc82991b..fe8a21202340c5892f5166ec294212c6e44ed3a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -585,4 +585,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -596,4 +596,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
entity.remove();
}
}

8
Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
View File

@ -136,10 +136,10 @@ index 10eb83bec33050ec1054de493960c87f67d4ec66..4675ddb1f7c989521dfc9fbd0367e6fb
}
// Spigot End
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 27b2ee740a705238995dd3bcea62b4bf74ec82dc..f6209e9c0b9e0ab99693025d23847bc62a06225d 100644
index fe8a21202340c5892f5166ec294212c6e44ed3a5..00d67c9911c52ddcdf48fda7998bcd2a8a35f0eb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -435,8 +435,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -436,8 +436,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override
public void closeInventory() {
@ -155,10 +155,10 @@ index 27b2ee740a705238995dd3bcea62b4bf74ec82dc..f6209e9c0b9e0ab99693025d23847bc6
@Override
public boolean isBlocking() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6270010f04a51c3bc5d434e617eb755daba59cb4..b40666d74c88e1af8ff126c780f17b357a2ab86b 100644
index 3d1c26cd9a8917b223736bcc9c8000b0f8b46a64..d494f8d7695249b43cd28ac2684e35bd8faaeea0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -789,7 +789,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -791,7 +791,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Close any foreign inventory
if (getHandle().activeContainer != getHandle().defaultContainer) {

4
Spigot-Server-Patches/0285-Expose-attack-cooldown-methods-for-Player.patch
View File

@ -27,10 +27,10 @@ index d9e5d71a87140c90b79902887bd2f481f02956dc..afc665bfe9d527ca8d19f3ab9df0900d
this.aA = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b40666d74c88e1af8ff126c780f17b357a2ab86b..a5d324f6d045c81d55a6bcc638205f509b151da4 100644
index d494f8d7695249b43cd28ac2684e35bd8faaeea0..cafad51e27dd0ea4f1a2c4ce49b5c4adf4516827 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1950,6 +1950,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1965,6 +1965,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getInventory().setItemInMainHand(hand);
}

4
Spigot-Server-Patches/0286-Improve-death-events.patch
View File

@ -357,10 +357,10 @@ index 7b565ddfffd0b9c78392ee115ef9c20ab89a3380..d78b9fd608da691220f1edeff506b36e
this.minecraftKey = minecraftKey;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a5d324f6d045c81d55a6bcc638205f509b151da4..99a0b73a552fa5310e90cfa4dcf208173da4814c 100644
index cafad51e27dd0ea4f1a2c4ce49b5c4adf4516827..9e808c70a8e9762e912b693027d5fbed85f85823 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1741,7 +1741,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1756,7 +1756,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void sendHealthUpdate() {

10
Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
View File

@ -106,10 +106,10 @@ index 00333548b470435aa89fb0f4b29047eb1461e992..5770d4183c1b9ab6119a25930283c023
public Location getBedSpawnLocation() {
NBTTagCompound data = getData();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 99a0b73a552fa5310e90cfa4dcf208173da4814c..725155a47154d3e40c90b5f40ea37d80f5e27cc5 100644
index 9e808c70a8e9762e912b693027d5fbed85f85823..8a251bb55c79c34880599a490efd271a36a09a04 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -143,6 +143,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -145,6 +145,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 99a0b73a552fa5310e90cfa4dcf208173da4814c..725155a47154d3e40c90b5f40ea37d80
// Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
@@ -1391,6 +1392,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1406,6 +1407,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.firstPlayed = firstPlayed;
}
@ -136,7 +136,7 @@ index 99a0b73a552fa5310e90cfa4dcf208173da4814c..725155a47154d3e40c90b5f40ea37d80
public void readExtraData(NBTTagCompound nbttagcompound) {
hasPlayedBefore = true;
if (nbttagcompound.hasKey("bukkit")) {
@@ -1413,6 +1426,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1428,6 +1441,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setExtraData(NBTTagCompound nbttagcompound) {
@ -145,7 +145,7 @@ index 99a0b73a552fa5310e90cfa4dcf208173da4814c..725155a47154d3e40c90b5f40ea37d80
if (!nbttagcompound.hasKey("bukkit")) {
nbttagcompound.set("bukkit", new NBTTagCompound());
}
@@ -1427,6 +1442,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1442,6 +1457,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
data.setLong("firstPlayed", getFirstPlayed());
data.setLong("lastPlayed", System.currentTimeMillis());
data.setString("lastKnownName", handle.getName());

4
Spigot-Server-Patches/0330-Block-Entity-remove-from-being-called-on-Players.patch
View File

@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
be unintentional in the few cases we've seen so far.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 725155a47154d3e40c90b5f40ea37d80f5e27cc5..bfb1beb4eaade3e198ea179f221de8f3e9c682af 100644
index 8a251bb55c79c34880599a490efd271a36a09a04..3f6db7e3fcc8fc5e8e1aa1f9add4bfe12f824d0b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1995,6 +1995,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2010,6 +2010,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetCooldown() {
getHandle().resetCooldown();
}

4
Spigot-Server-Patches/0354-Per-Player-View-Distance-API-placeholders.patch
View File

@ -40,10 +40,10 @@ index 9331f96f68f121b41ce74904d624520291b7c72e..1074995e8c8a83f6cdb94019123fbffa
double deltaZ = this.locZ() - player.locZ();
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index bfb1beb4eaade3e198ea179f221de8f3e9c682af..5277fceedccc355698ee1895306a3666bf5c47cd 100644
index 3f6db7e3fcc8fc5e8e1aa1f9add4bfe12f824d0b..4a147c5f56c56a4014b766aa3f56060f1a2ab495 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2004,6 +2004,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2019,6 +2019,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
super.remove();
}
}

6
Spigot-Server-Patches/0452-Prevent-opening-inventories-when-frozen.patch
View File

@ -36,10 +36,10 @@ index 03e1b76a8b6850a26ed8a7b1992e09756166f5b8..27926559a665a5af14f11b8b4331cdb5
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index f6209e9c0b9e0ab99693025d23847bc62a06225d..1c271ee568a02f1ab9c8722b840444f5cf5d657f 100644
index 00d67c9911c52ddcdf48fda7998bcd2a8a35f0eb..75aa141e86e301254b25ede3da67513aae76fa5c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -318,7 +318,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -319,7 +319,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
String title = container.getBukkitView().getTitle();
@ -48,7 +48,7 @@ index f6209e9c0b9e0ab99693025d23847bc62a06225d..1c271ee568a02f1ab9c8722b840444f5
getHandle().activeContainer = container;
getHandle().activeContainer.addSlotListener(player);
}
@@ -388,7 +388,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -389,7 +389,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
// Now open the window
Containers<?> windowType = CraftContainer.getNotchInventoryType(inventory.getTopInventory());
String title = inventory.getTitle();

4
Spigot-Server-Patches/0458-Implement-Player-Client-Options-API.patch
View File

@ -158,7 +158,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..be97a0b01b3272e01ece90172f283e3f
return this.e;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5277fceedccc355698ee1895306a3666bf5c47cd..9a6e6a75338f3ab7f8247c5f9e660f0d3cb1177d 100644
index 4a147c5f56c56a4014b766aa3f56060f1a2ab495..517a4b64e8e0a3237c349fa284d23b43039035f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,8 @@
@ -170,7 +170,7 @@ index 5277fceedccc355698ee1895306a3666bf5c47cd..9a6e6a75338f3ab7f8247c5f9e660f0d
import com.destroystokyo.paper.Title;
import com.destroystokyo.paper.profile.CraftPlayerProfile;
import com.destroystokyo.paper.profile.PlayerProfile;
@@ -2014,6 +2017,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2029,6 +2032,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setViewDistance(int viewDistance) {
throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
}

4
Spigot-Server-Patches/0487-Potential-bed-API.patch
View File

@ -8,10 +8,10 @@ Adds a new method to fetch the location of a player's bed without generating any
getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 1c271ee568a02f1ab9c8722b840444f5cf5d657f..7c22a24d0b50f0a8f4ccfef87f7f77028c3188c6 100644
index 75aa141e86e301254b25ede3da67513aae76fa5c..fef2035fe5564645d786d042dceedb10ca8b59ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -126,6 +126,22 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -127,6 +127,22 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
return getHandle().sleepTicks;
}

4
Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
View File

@ -1223,10 +1223,10 @@ index 11559f9e4b3f5fda6bfe4f70f963ce4f7967f051..bf2f602bb07aa4c7c0a22ad9be9e77d7
net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);
return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9a6e6a75338f3ab7f8247c5f9e660f0d3cb1177d..db617e04fe492fc7c1bbfe0afd56a4ddb46b5d65 100644
index 517a4b64e8e0a3237c349fa284d23b43039035f4..c7b4e5f2a26aaa83520b55ec5c917d63980c8041 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -742,6 +742,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -744,6 +744,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new UnsupportedOperationException("Cannot set rotation of players. Consider teleporting instead.");
}

2
work/Bukkit

@ -1 +1 @@
Subproject commit 6ff65c824ad8dc9ba9228999800a0d7010904893
Subproject commit 1cb03826ebde4ef887519ce37b0a2a341494a183

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit d9bd43b060322ad72af3008669878ee5d6cc2cc0
Subproject commit 551e770f5f981053885e2e1a043b4ecb54a80aef