Fixed glider not closing on right click anymore on servers (#28)

Co-authored-by: Shadda <no> Co-authored-by: Maya <[email protected]> Co-authored-by: Yannick Marcotte-Gourde <[email protected]>
GTNewHorizons · Jan 25, 2025 · ce7167e · ce7167e
1 parent 12e8487
commit ce7167e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/openblocks/common/entity/EntityHangGlider.java b/src/main/java/openblocks/common/entity/EntityHangGlider.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 import java.util.Random;
 
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -79,7 +78,7 @@ public static void updateGliders(World worldObj) {
         for (Map.Entry<EntityPlayer, EntityHangGlider> e : gliderMap.entrySet()) {
             EntityPlayer player = e.getKey();
             EntityHangGlider glider = e.getValue();
-            if (isGliderValid(player, glider)) glider.fixPositions(player, player instanceof EntityPlayerSP);
+            if (isGliderValid(player, glider)) glider.fixPositions(player, true);
             else glider.setDead();
         }
     }
@@ -124,6 +123,7 @@ public void writeSpawnData(ByteBuf data) {
             data.writeInt(-42);
         } else {
             data.writeInt(player.getEntityId());
+            gliderMap.put(player, this);
         }
     }
 

diff --git a/src/main/java/openblocks/common/item/ItemHangGlider.java b/src/main/java/openblocks/common/item/ItemHangGlider.java
@@ -98,16 +98,12 @@ public static void loadConfig(FMLPreInitializationEvent event) {
     public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
         if (!world.isRemote && player != null) {
             EntityHangGlider glider = EntityHangGlider.getEntityHangGlider(player);
-            if (glider != null) despawnGlider(player, glider);
+            if (glider != null) glider.setDead();
             else spawnGlider(player);
         }
         return itemStack;
     }
 
-    private static void despawnGlider(EntityPlayer player, EntityHangGlider glider) {
-        glider.setDead();
-    }
-
     private static void spawnGlider(EntityPlayer player) {
         if (isInvalidDimension(player)) {
             player.addChatMessage(new ChatComponentTranslation("item.openblocks.hangglider.invalid_dimension"));