diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch
index db6880ebe..c53c95ddd 100644
--- a/patches/server/Adventure.patch
+++ b/patches/server/Adventure.patch
@@ -1642,12 +1642,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
 -        if (joinMessage != null && joinMessage.length() > 0) {
+-            for (Component line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) {
+-                this.server.getPlayerList().broadcastSystemMessage(line, false);
+-            }
 +        if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
 +            joinMessage = PaperAdventure.asVanilla(jm); // Paper - Adventure
 +            this.server.getPlayerList().broadcastSystemMessage(joinMessage, false); // Paper - Adventure
-             for (Component line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) {
-                 this.server.getPlayerList().broadcastSystemMessage(line, false);
-             }
+         }
+         // CraftBukkit end
+ 
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
  
      }
diff --git a/patches/server/Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/Fix-swamp-hut-cat-generation-deadlock.patch
index 488e55683..60f4b6c11 100644
--- a/patches/server/Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/Fix-swamp-hut-cat-generation-deadlock.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public List<StructureStart> startsForStructure(ChunkPos pos, Predicate<Structure> predicate) {
 -        Map<Structure, LongSet> map = this.level.getChunk(pos.x, pos.z, ChunkStatus.STRUCTURE_REFERENCES).getAllReferences();
 +        // Paper start
-+        return this.startsForStructure(chunkPos, predicate, null);
++        return this.startsForStructure(pos, predicate, null);
 +    }
 +    public List<StructureStart> startsForStructure(ChunkPos pos, Predicate<Structure> predicate, @Nullable ServerLevelAccessor levelAccessor) {
 +        Map<Structure, LongSet> map = (levelAccessor == null ? this.level : levelAccessor).getChunk(pos.x, pos.z, ChunkStatus.STRUCTURE_REFERENCES).getAllReferences();