Skip to content

Commit 4f64c32

Browse files
committed
Update Paper
1 parent c9ed45f commit 4f64c32

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12864,7 +12864,7 @@ index bd07e6a5aa1883786d789ea71711a0c0c0a95c26..09469ad131622158fe5579216fc41642
1286412864
}
1286512865
// Spigot end
1286612866
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
12867-
index 064a9b6cf6792192fc1fa80095a48c2025cebf2a..77546196289bccbbc0c40c2d69ff9ddd2bc98ffe 100644
12867+
index 9041830c19e2899479e1519488faba5c416ccd88..d60a1d4c4c8bd7650170775e37e8ca76b46a1588 100644
1286812868
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1286912869
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1287012870
@@ -284,10 +284,10 @@ public class ServerGamePacketListenerImpl
@@ -13239,7 +13239,7 @@ index 064a9b6cf6792192fc1fa80095a48c2025cebf2a..77546196289bccbbc0c40c2d69ff9ddd
1323913239
}
1324013240

1324113241
private void updateSignText(ServerboundSignUpdatePacket packet, List<FilteredText> filteredText) {
13242-
@@ -3575,7 +3663,7 @@ public class ServerGamePacketListenerImpl
13242+
@@ -3585,7 +3673,7 @@ public class ServerGamePacketListenerImpl
1324313243
this.chatMessageChain
1324413244
.append(
1324513245
() -> {

folia-server/paper-patches/features/0001-Region-Threading-Base.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3153,10 +3153,10 @@ index d927938df4ac2b5de7ef2d26a3f0056b8310ddcd..2778d675b436642667780758c2e09d60
31533153
}
31543154

31553155
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3156-
index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..00abfbfc0c75434b18e89334a35b657519b51abc 100644
3156+
index 1db6276ae7a547860cf2c6f85b37ec4d6b33655a..0e32a9ad852e521ce9618acc1642d3748995b4bf 100644
31573157
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
31583158
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3159-
@@ -234,7 +234,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3159+
@@ -237,7 +237,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
31603160

31613161
@Override
31623162
public ServerPlayer getHandle() {
@@ -3165,7 +3165,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..00abfbfc0c75434b18e89334a35b6575
31653165
}
31663166

31673167
@Override
3168-
@@ -684,7 +684,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3168+
@@ -687,7 +687,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
31693169

31703170
@Override
31713171
public void kickPlayer(String message) {
@@ -3174,7 +3174,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..00abfbfc0c75434b18e89334a35b6575
31743174
this.getHandle().transferCookieConnection.kickPlayer(CraftChatMessage.fromStringOrEmpty(message, true), org.bukkit.event.player.PlayerKickEvent.Cause.PLUGIN); // Paper - kick event cause
31753175
}
31763176

3177-
@@ -697,7 +697,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3177+
@@ -700,7 +700,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
31783178

31793179
@Override
31803180
public void kick(net.kyori.adventure.text.Component message, org.bukkit.event.player.PlayerKickEvent.Cause cause) {
@@ -3183,7 +3183,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..00abfbfc0c75434b18e89334a35b6575
31833183
final ServerGamePacketListenerImpl connection = this.getHandle().connection;
31843184
if (connection != null) {
31853185
connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message, cause);
3186-
@@ -1405,6 +1405,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3186+
@@ -1408,6 +1408,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
31873187

31883188
@Override
31893189
public boolean teleport(Location location, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause, io.papermc.paper.entity.TeleportFlag... flags) {
@@ -3195,7 +3195,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..00abfbfc0c75434b18e89334a35b6575
31953195
Set<io.papermc.paper.entity.TeleportFlag.Relative> relativeArguments;
31963196
Set<io.papermc.paper.entity.TeleportFlag> allFlags;
31973197
if (flags.length == 0) {
3198-
@@ -2072,7 +2077,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3198+
@@ -2075,7 +2080,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
31993199
private void unregisterEntity(Entity other) {
32003200
// Paper end
32013201
ChunkMap tracker = ((ServerLevel) this.getHandle().level()).getChunkSource().chunkMap;
@@ -3204,7 +3204,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..00abfbfc0c75434b18e89334a35b6575
32043204
if (entry != null) {
32053205
entry.removePlayer(this.getHandle());
32063206
}
3207-
@@ -2169,7 +2174,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3207+
@@ -2172,7 +2177,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
32083208
if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
32093209
}
32103210

@@ -3213,7 +3213,7 @@ index 8a1e2785d4a3dd6f5d97c152e9b42d5c257d1ee6..00abfbfc0c75434b18e89334a35b6575
32133213
if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
32143214
entry.updatePlayer(this.getHandle());
32153215
}
3216-
@@ -3317,7 +3322,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
3216+
@@ -3327,7 +3332,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
32173217
@Override
32183218
public void respawn() {
32193219
if (CraftPlayer.this.getHealth() <= 0 && CraftPlayer.this.isOnline()) {
@@ -3835,7 +3835,7 @@ index 9851c3890c9377d9fd1813f82766c2841ae48fd4..034b210ca024dcb3d9f59f1cdeef8c16
38353835
}
38363836

38373837
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
3838-
index 6f86a505c99010eb80e76e2fbe36414fcde80a39..ee8fcf73665de82fa3968e0998b3221d9088647b 100644
3838+
index 9774c9c72a910ccd919b903d92f4068c06d199d7..77871ce6d0eb0005893ea10b17e711ce87d7bfdd 100644
38393839
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
38403840
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
38413841
@@ -808,7 +808,7 @@ public class CraftEventFactory {

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.5-R0.1-SNAPSHOT
33
mcVersion=1.21.5
44

5-
paperRef=87349c317f0aa060e8c877e65dc27bb50dda3183
5+
paperRef=a033e3b9ef78cfe85be807ac3fd1dd956274d4db
66

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

0 commit comments

Comments
 (0)