Skip to content

Commit f79c0da

Browse files
electronicboyelectronicboy
committed
Updated Upstream (Bukkit/CraftBukkit)
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: 5c21a63 PR-717: Add PlayerHideEntityEvent and PlayerShowEntityEvent CraftBukkit Changes: c26a7b5 PR-1000: Add PlayerHideEntityEvent and PlayerShowEntityEvent
1 parent 17eb884 commit f79c0da

File tree

34 files changed

+89
-89
lines changed

34 files changed

+89
-89
lines changed

‎patches/server/0010-Timings-v2.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,10 +1918,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
19181918
- }
19191919
-}
19201920
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
1921-
index fef3a50c48d1548a6b39e60c3a1acb283d20dd74..42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe 100644
1921+
index 929d8f7bf18a618e0447f726dbbd9e6fe2a6529a..43203833aac1a95bad813ee84da3225489da4b70 100644
19221922
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
19231923
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
1924-
@@ -1902,6 +1902,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
1924+
@@ -1908,6 +1908,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
19251925
packet.components = components;
19261926
CraftPlayer.this.getHandle().connection.send(packet);
19271927
}

‎patches/server/0012-Adventure.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,10 +2348,10 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa
23482348
public boolean isOp() {
23492349
return true;
23502350
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2351-
index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3e6b7fbf7 100644
2351+
index 43203833aac1a95bad813ee84da3225489da4b70..e87afc4930f5450113ffb6c4bba57e2e8fd6f2f9 100644
23522352
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
23532353
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2354-
@@ -253,14 +253,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2354+
@@ -255,14 +255,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
23552355

23562356
@Override
23572357
public String getDisplayName() {
@@ -2391,7 +2391,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
23912391
@Override
23922392
public String getPlayerListName() {
23932393
return this.getHandle().listName == null ? getName() : CraftChatMessage.fromComponent(this.getHandle().listName);
2394-
@@ -279,42 +304,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2394+
@@ -281,42 +306,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
23952395
}
23962396
}
23972397

@@ -2443,7 +2443,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
24432443
this.getHandle().connection.send(packet);
24442444
}
24452445

2446-
@@ -346,6 +371,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2446+
@@ -348,6 +373,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
24472447
this.getHandle().connection.disconnect(message == null ? "" : message);
24482448
}
24492449

@@ -2461,7 +2461,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
24612461
@Override
24622462
public void setCompassTarget(Location loc) {
24632463
if (this.getHandle().connection == null) return;
2464-
@@ -601,6 +637,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2464+
@@ -603,6 +639,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
24652465
this.getHandle().connection.send(packet);
24662466
}
24672467

@@ -2495,7 +2495,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
24952495
@Override
24962496
public void sendSignChange(Location loc, String[] lines) {
24972497
this.sendSignChange(loc, lines, DyeColor.BLACK);
2498-
@@ -628,14 +691,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2498+
@@ -630,14 +693,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
24992499
}
25002500

25012501
Component[] components = CraftSign.sanitizeLines(lines);
@@ -2513,7 +2513,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
25132513
}
25142514

25152515
@Override
2516-
@@ -1326,7 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2516+
@@ -1332,7 +1396,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
25172517

25182518
@Override
25192519
public void setResourcePack(String url) {
@@ -2522,7 +2522,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
25222522
}
25232523

25242524
@Override
2525-
@@ -1341,7 +1405,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2525+
@@ -1347,7 +1411,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
25262526

25272527
@Override
25282528
public void setResourcePack(String url, byte[] hash, boolean force) {
@@ -2531,7 +2531,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
25312531
}
25322532

25332533
@Override
2534-
@@ -1357,6 +1421,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2534+
@@ -1363,6 +1427,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
25352535
}
25362536
}
25372537

@@ -2553,7 +2553,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
25532553
public void addChannel(String channel) {
25542554
Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
25552555
channel = StandardMessenger.validateAndCorrectChannel(channel);
2556-
@@ -1761,6 +1840,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2556+
@@ -1767,6 +1846,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
25572557
return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
25582558
}
25592559

@@ -2566,7 +2566,7 @@ index 42df05eb0f7fe1910433e4bfe53c17dc5f5cbdfe..3869717bb9246cabf900840aac93eaa3
25662566
@Override
25672567
public int getPing() {
25682568
return this.getHandle().latency;
2569-
@@ -1806,6 +1891,194 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2569+
@@ -1812,6 +1897,194 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
25702570
return this.getHandle().allowsListing();
25712571
}
25722572

‎patches/server/0023-Player-affects-spawning-API.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ index a30780611b6842e35579f0ca11d75161bf365c70..4be2833b03d24e5d87c23f04c248fbe4
7474

7575
public void clientTick(Level world, BlockPos pos) {
7676
diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
77-
index c65d1dc6eb0c1fc7c4a91faf0f1c6f26b3c2a76e..0dc46471f7247e5d36c3896a0c87473072362fe6 100644
77+
index 1e420c4230a326da345b2e28442ece26b44f8259..41d20c16ea165cf166c6f3b228bc8261b0ee0d9c 100644
7878
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
7979
+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
8080
@@ -71,8 +71,8 @@ public interface EntityGetter {
@@ -117,10 +117,10 @@ index c65d1dc6eb0c1fc7c4a91faf0f1c6f26b3c2a76e..0dc46471f7247e5d36c3896a0c874730
117117
for(Player player : this.players()) {
118118
if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
119119
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
120-
index 3869717bb9246cabf900840aac93eaa3e6b7fbf7..13d9bcb9ccc34bf81ba834365e511eabd4153aee 100644
120+
index e87afc4930f5450113ffb6c4bba57e2e8fd6f2f9..3e6b0348ea7d6282725ded67ff97868e016a1e91 100644
121121
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
122122
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
123-
@@ -1854,8 +1854,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
123+
@@ -1860,8 +1860,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
124124
@Override
125125
public String getLocale() {
126126
return this.getHandle().locale;

‎patches/server/0026-Only-refresh-abilities-if-needed.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Only refresh abilities if needed
55

66

77
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
8-
index 13d9bcb9ccc34bf81ba834365e511eabd4153aee..a0e5298abb15c11dc21ea09638a34ef11f253349 100644
8+
index 3e6b0348ea7d6282725ded67ff97868e016a1e91..91c27a71c5ed63ec5b75bba172e625b795793473 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
11-
@@ -1523,12 +1523,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
11+
@@ -1529,12 +1529,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
1212

1313
@Override
1414
public void setFlying(boolean value) {

‎patches/server/0039-Implement-PlayerLocaleChangeEvent.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ index 88b6be62678fc09b5a39db28c6d71cc31b16dbcd..352bfe795aea26307de9c998d67a43af
3030
this.locale = packet.language;
3131
// Paper start
3232
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
33-
index a0e5298abb15c11dc21ea09638a34ef11f253349..3a3f9ef73c2ff39cf589b517b8b869f55edbe8ab 100644
33+
index 91c27a71c5ed63ec5b75bba172e625b795793473..a137989c06a259dbaaa0cbac52d801a6113184bb 100644
3434
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3535
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
36-
@@ -1854,8 +1854,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
36+
@@ -1860,8 +1860,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3737

3838
@Override
3939
public String getLocale() {

‎patches/server/0040-Per-Player-View-Distance-API-placeholders.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ index 83ad8c26a6152b4dd7ff9e432dabcc5fc17e3df0..1fa945a6431b813edbdcd7cda9bd48b5
5656

5757
// Spigot start
5858
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
59-
index 8f5f26deeaf8c66af70e674922634b34eaa19831..6dfbdc0279678e5a5dcf20a96fc638a77defb286 100644
59+
index a137989c06a259dbaaa0cbac52d801a6113184bb..73ab957bfafee4bbdf80b0fd34fdc7b46b55805a 100644
6060
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
6161
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
62-
@@ -380,6 +380,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
62+
@@ -382,6 +382,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
6363
connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
6464
}
6565
}

‎patches/server/0052-Player-Tab-List-and-Title-APIs.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
6363
// Paper end
6464
buf.writeComponent(this.text);
6565
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
66-
index 6dfbdc0279678e5a5dcf20a96fc638a77defb286..8ffffe42d4e259da8cc2c15dc92f162e54d40355 100644
66+
index 73ab957bfafee4bbdf80b0fd34fdc7b46b55805a..f2b3783373336221c0aef8bae04d350eed0e8ec2 100644
6767
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
6868
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
6969
@@ -1,5 +1,6 @@
@@ -73,7 +73,7 @@ index 6dfbdc0279678e5a5dcf20a96fc638a77defb286..8ffffe42d4e259da8cc2c15dc92f162e
7373
import com.google.common.base.Preconditions;
7474
import com.google.common.collect.ImmutableSet;
7575
import com.google.common.io.BaseEncoding;
76-
@@ -251,6 +252,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
76+
@@ -253,6 +254,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
7777
}
7878
}
7979

‎patches/server/0055-Configurable-inter-world-teleportation-safety.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ index c248b66486044150c64eaddbef85fa6644494212..ada624b5f58381122e59568c2087cf38
3030
+ }
3131
}
3232
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
33-
index 8ffffe42d4e259da8cc2c15dc92f162e54d40355..c2e9f4609c70adf36425ee12bbbf47dd92bdbd0e 100644
33+
index f2b3783373336221c0aef8bae04d350eed0e8ec2..89e22db19a42e9092bb3ee2e5fd01b2e65fd9878 100644
3434
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3535
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
36-
@@ -921,7 +921,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
36+
@@ -923,7 +923,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3737
if (fromWorld == toWorld) {
3838
entity.connection.teleport(to);
3939
} else {

‎patches/server/0061-Complete-resource-pack-API.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ index fed5dcdc62700bd661035011a06788fddec1b2a6..22d77ed6f6c63a4ba77ec582a7ba26b9
2323

2424
@Override
2525
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
26-
index a9fb93173266572acf4447e980859e5a2b6e9886..e81d8300ee80bfc20660b2c99a17703ad8d37701 100644
26+
index 89e22db19a42e9092bb3ee2e5fd01b2e65fd9878..754d3c4c6aca42e569642a01ab816d5ca653d3fb 100644
2727
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2828
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
29-
@@ -135,6 +135,7 @@ import org.bukkit.metadata.MetadataValue;
29+
@@ -137,6 +137,7 @@ import org.bukkit.metadata.MetadataValue;
3030
import org.bukkit.plugin.Plugin;
3131
import org.bukkit.plugin.messaging.StandardMessenger;
3232
import org.bukkit.scoreboard.Scoreboard;
3333
+import org.jetbrains.annotations.NotNull;
3434

3535
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
3636

37-
@@ -151,6 +152,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
37+
@@ -153,6 +154,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3838
private double health = 20;
3939
private boolean scaledHealth = false;
4040
private double healthScale = 20;
@@ -45,7 +45,7 @@ index a9fb93173266572acf4447e980859e5a2b6e9886..e81d8300ee80bfc20660b2c99a17703a
4545

4646
public CraftPlayer(CraftServer server, ServerPlayer entity) {
4747
super(server, entity);
48-
@@ -1994,6 +1999,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
48+
@@ -2000,6 +2005,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
4949
public boolean getAffectsSpawning() {
5050
return this.getHandle().affectsSpawning;
5151
}

‎patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ index e94344170190ae9429b744ec7878c3aa093f01b6..e13808657e0c7dc94fcd2844690a31d0
4444
}
4545

4646
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
47-
index e81d8300ee80bfc20660b2c99a17703ad8d37701..c57a1e4f718d3a0ad644a432142110a397cd3ae6 100644
47+
index 754d3c4c6aca42e569642a01ab816d5ca653d3fb..1bae28202288d51a67788b172b9c4e0a4eca2807 100644
4848
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
4949
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
50-
@@ -1799,6 +1799,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
50+
@@ -1805,6 +1805,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
5151
}
5252

5353
public void setRealHealth(double health) {

0 commit comments

Comments
 (0)