Skip to content

Commit 4e7607d

Browse files
committed
Update Paper
1 parent 290f789 commit 4e7607d

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

folia-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3-
@@ -666,7 +_,7 @@
3+
@@ -667,7 +_,7 @@
44

55
@Override
66
public void kickPlayer(String message) {
@@ -9,7 +9,7 @@
99
this.getHandle().transferCookieConnection.kickPlayer(CraftChatMessage.fromStringOrEmpty(message, true), org.bukkit.event.player.PlayerKickEvent.Cause.PLUGIN); // Paper - kick event cause
1010
}
1111

12-
@@ -684,7 +_,7 @@
12+
@@ -685,7 +_,7 @@
1313

1414
@Override
1515
public void kick(net.kyori.adventure.text.Component message, org.bukkit.event.player.PlayerKickEvent.Cause cause) {
@@ -18,7 +18,7 @@
1818
final ServerGamePacketListenerImpl connection = this.getHandle().connection;
1919
if (connection != null) {
2020
connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message, cause);
21-
@@ -1403,6 +_,11 @@
21+
@@ -1404,6 +_,11 @@
2222

2323
@Override
2424
public boolean teleport(Location location, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause, io.papermc.paper.entity.TeleportFlag... flags) {
@@ -30,7 +30,7 @@
3030
Set<io.papermc.paper.entity.TeleportFlag.Relative> relativeArguments;
3131
Set<io.papermc.paper.entity.TeleportFlag> allFlags;
3232
if (flags.length == 0) {
33-
@@ -2067,7 +_,7 @@
33+
@@ -2068,7 +_,7 @@
3434
private void unregisterEntity(Entity other) {
3535
// Paper end
3636
ChunkMap tracker = ((ServerLevel) this.getHandle().level()).getChunkSource().chunkMap;
@@ -39,7 +39,7 @@
3939
if (entry != null) {
4040
entry.removePlayer(this.getHandle());
4141
}
42-
@@ -2164,7 +_,7 @@
42+
@@ -2165,7 +_,7 @@
4343
if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
4444
}
4545

@@ -48,7 +48,7 @@
4848
if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
4949
entry.updatePlayer(this.getHandle());
5050
}
51-
@@ -2313,9 +_,16 @@
51+
@@ -2314,9 +_,16 @@
5252
return this;
5353
}
5454

@@ -66,7 +66,7 @@
6666
}
6767

6868
public void setHandle(final ServerPlayer entity) {
69-
@@ -3345,7 +_,7 @@
69+
@@ -3348,7 +_,7 @@
7070
{
7171
if ( CraftPlayer.this.getHealth() <= 0 && CraftPlayer.this.isOnline() )
7272
{

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=dev.folia
22
version=1.21.4-R0.1-SNAPSHOT
33
mcVersion=1.21.4
44

5-
paperRef=73f7736eb93a64cc0270929cb01992404696d66d
5+
paperRef=88bbead13b07914c01866e35df16b72110fa501e
66

77
org.gradle.configuration-cache=true
88
org.gradle.caching=true

patch.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gradlew applyAllPatches

rb.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gradlew rebuildPaperPatches & gradlew rebuildServerPatches & gradlew rebuildMinecraftPatches

0 commit comments

Comments
 (0)