Skip to content

Commit

Permalink
Update Paper
Browse files Browse the repository at this point in the history
  • Loading branch information
Spottedleaf committed Jan 25, 2025
1 parent 75f1605 commit 41eab7a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
final ServerGamePacketListenerImpl connection = this.getHandle().connection;
if (connection != null) {
connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message, cause);
@@ -1404,6 +_,11 @@
@@ -1405,6 +_,11 @@

@Override
public boolean teleport(Location location, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause, io.papermc.paper.entity.TeleportFlag... flags) {
Expand All @@ -30,7 +30,7 @@
Set<io.papermc.paper.entity.TeleportFlag.Relative> relativeArguments;
Set<io.papermc.paper.entity.TeleportFlag> allFlags;
if (flags.length == 0) {
@@ -2068,7 +_,7 @@
@@ -2069,7 +_,7 @@
private void unregisterEntity(Entity other) {
// Paper end
ChunkMap tracker = ((ServerLevel) this.getHandle().level()).getChunkSource().chunkMap;
Expand All @@ -39,7 +39,7 @@
if (entry != null) {
entry.removePlayer(this.getHandle());
}
@@ -2165,7 +_,7 @@
@@ -2166,7 +_,7 @@
if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
}

Expand All @@ -48,7 +48,7 @@
if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
entry.updatePlayer(this.getHandle());
}
@@ -2314,9 +_,16 @@
@@ -2315,9 +_,16 @@
return this;
}

Expand All @@ -66,7 +66,7 @@
}

public void setHandle(final ServerPlayer entity) {
@@ -3348,7 +_,7 @@
@@ -3349,7 +_,7 @@
{
if ( CraftPlayer.this.getHealth() <= 0 && CraftPlayer.this.isOnline() )
{
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group=dev.folia
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4

paperRef=88bbead13b07914c01866e35df16b72110fa501e
paperRef=336ea9dfeb23d9eae0711db974a3465dfe72746f

org.gradle.configuration-cache=true
org.gradle.caching=true
Expand Down

0 comments on commit 41eab7a

Please sign in to comment.