reduce diff

Author: Lulu13022002

paper-server/patches/sources/net/minecraft/commands/Commands.java.patch

@@ -102,16 +102,6 @@
                  StackTraceElement[] stackTrace = var12.getStackTrace();
 
                  for (int i = 0; i < Math.min(stackTrace.length, 3); i++) {
-@@ -356,7 +_,8 @@
-         }
-     }
- 
--    private static @Nullable ContextChain<CommandSourceStack> finishParsing(
-+    
-+    private ContextChain<CommandSourceStack> finishParsing(
-         ParseResults<CommandSourceStack> parseResults, String command, CommandSourceStack source
-     ) {
-         try {
 @@ -364,7 +_,11 @@
              return ContextChain.tryFlatten(parseResults.getContext().build(command))
                  .orElseThrow(() -> CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand().createWithContext(parseResults.getReader()));

paper-server/patches/sources/net/minecraft/world/level/block/NetherPortalBlock.java.patch

@@ -38,7 +38,7 @@
              entity.setAsInsidePortal(this, pos);
          }
      }
-@@ -126,23 +_,46 @@
+@@ -126,23 +_,47 @@
 
      @Override
      public @Nullable TeleportTransition getPortalDestination(ServerLevel level, Entity entity, BlockPos pos) {
@@ -84,9 +84,9 @@
 
      private @Nullable TeleportTransition getExitPortal(
 -        ServerLevel level, Entity entity, BlockPos pos, BlockPos exitPos, boolean isNether, WorldBorder worldBorder
--    ) {
++        ServerLevel level, Entity entity, BlockPos pos, BlockPos exitPos, WorldBorder worldBorder, org.bukkit.craftbukkit.event.PortalEventResult result // CraftBukkit
+     ) {
 -        Optional<BlockPos> optional = level.getPortalForcer().findClosestPortalPosition(exitPos, isNether, worldBorder);
-+        ServerLevel level, Entity entity, BlockPos pos, BlockPos exitPos, WorldBorder worldBorder, org.bukkit.craftbukkit.event.PortalEventResult result) { // CraftBukkit
 +        Optional<BlockPos> optional = level.getPortalForcer().findClosestPortalPosition(exitPos, worldBorder, result.searchRadius()); // CraftBukkit
          BlockUtil.FoundRectangle largestRectangleAround;
          TeleportTransition.PostTeleportTransition postTeleportTransition;