More diff/changed variable name cleanup

paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -306,11 +306,10 @@
      }
  
      public void onClientRemoval() {
-@@ -367,7 +_,18 @@
+@@ -367,6 +_,17 @@
      }
  
      public void setPose(Pose pose) {
--        this.entityData.set(DATA_POSE, pose);
 +        if (this.fixedPose) return; // Paper - Expand Pose API
 +        // CraftBukkit start
 +        if (pose == this.getPose()) {
@@ -322,10 +321,9 @@
 +        }
 +        // Paper end - Don't fire sync event during generation
 +        // CraftBukkit end
-+        this.entityData.set(Entity.DATA_POSE, pose);
+         this.entityData.set(DATA_POSE, pose);
      }
  
-     public Pose getPose() {
 @@ -390,6 +_,32 @@
      }