From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Tue, 4 Jul 2023 14:03:03 +0800
Subject: [PATCH] Fix Paper#9372

This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)

diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fe5ef64df18c38cfb7912c7415ece9cc94cbc222..af8d99c2f7393bcbd10d045b72f6d8c17c0b7929 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1260,6 +1260,7 @@ public class ServerPlayer extends Player {
                 this.setServerLevel(worldserver);
                 this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                 this.connection.resetPosition();
+                if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
                 worldserver.addDuringPortalTeleport(this);
                 worldserver1.getProfiler().pop();
                 this.triggerDimensionChangeTriggers(worldserver1);
@@ -1976,6 +1977,7 @@ public class ServerPlayer extends Player {
     public void moveTo(double x, double y, double z) {
         super.moveTo(x, y, z);
         this.connection.resetPosition();
+        if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
     }
 
     @Override
@@ -2222,6 +2224,7 @@ public class ServerPlayer extends Player {
 
             this.connection.send(new ClientboundSetCameraPacket(this.camera));
             this.connection.resetPosition();
+            if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
         }
 
     }
@@ -2661,6 +2664,7 @@ public class ServerPlayer extends Player {
     public void forceSetPositionRotation(double x, double y, double z, float yaw, float pitch) {
         this.moveTo(x, y, z, yaw, pitch);
         this.connection.resetPosition();
+        if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
     }
 
     @Override