From 94e533ea7ce5d87e8cbcf23a3f3d8b66bc633448 Mon Sep 17 00:00:00 2001
From: basaigh <53559772+basaigh@users.noreply.github.com>
Date: Sun, 21 Apr 2024 01:33:07 +0100
Subject: [PATCH] Fix tags and attributes

---
 .../org/geysermc/geyser/entity/type/LivingEntity.java  |  2 +-
 .../entity/type/living/animal/AxolotlEntity.java       |  2 +-
 .../org/geysermc/geyser/session/GeyserSession.java     |  2 +-
 .../org/geysermc/geyser/session/cache/TagCache.java    | 10 +++++-----
 gradle/libs.versions.toml                              |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java
index 245b99cef..b070bdfff 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java
@@ -299,7 +299,7 @@ public class LivingEntity extends Entity {
                 case GENERIC_MOVEMENT_SPEED -> newAttributes.add(calculateAttribute(javaAttribute, GeyserAttributeType.MOVEMENT_SPEED));
                 case GENERIC_FOLLOW_RANGE -> newAttributes.add(calculateAttribute(javaAttribute, GeyserAttributeType.FOLLOW_RANGE));
                 case GENERIC_KNOCKBACK_RESISTANCE -> newAttributes.add(calculateAttribute(javaAttribute, GeyserAttributeType.KNOCKBACK_RESISTANCE));
-                case HORSE_JUMP_STRENGTH -> newAttributes.add(calculateAttribute(javaAttribute, GeyserAttributeType.HORSE_JUMP_STRENGTH));
+                case GENERIC_JUMP_STRENGTH -> newAttributes.add(calculateAttribute(javaAttribute, GeyserAttributeType.HORSE_JUMP_STRENGTH));
             }
         }
     }
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java
index 85b2afc14..97753f63f 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java
@@ -61,7 +61,7 @@ public class AxolotlEntity extends AnimalEntity {
 
     @Override
     public boolean canEat(Item item) {
-        return session.getTagCache().isAxolotlTemptItem(item);
+        return session.getTagCache().isAxolotlFood(item);
     }
 
     @Override
diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index 936fc932d..8e1ed2e51 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -368,7 +368,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
     /**
      * All dimensions that the client could possibly connect to.
      */
-    private final Map<String, JavaDimension> dimensions = new Object2ObjectOpenHashMap<>(3);
+    private final Int2ObjectMap<JavaDimension> dimensions = new Int2ObjectOpenHashMap<>(4);
 
     private final Int2ObjectMap<TextDecoration> chatTypes = new Int2ObjectOpenHashMap<>(7);
 
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
index 5acfc1f09..57000bf8b 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
@@ -58,7 +58,7 @@ public class TagCache {
     private IntList requiresDiamondTool;
 
     /* Items */
-    private IntList axolotlTemptItems;
+    private IntList axolotlFood;
     private IntList creeperIgniters;
     private IntList fishes;
     private IntList flowers;
@@ -96,7 +96,7 @@ public class TagCache {
         }
 
         Map<String, int[]> itemTags = packet.getTags().get("minecraft:item");
-        this.axolotlTemptItems = IntList.of(itemTags.get("minecraft:axolotl_tempt_items"));
+        this.axolotlFood = IntList.of(itemTags.get("minecraft:axolotl_food"));
         this.creeperIgniters = load(itemTags.get("minecraft:creeper_igniters"));
         this.fishes = IntList.of(itemTags.get("minecraft:fishes"));
         this.flowers = IntList.of(itemTags.get("minecraft:flowers"));
@@ -133,7 +133,7 @@ public class TagCache {
         this.requiresIronTool = IntLists.emptyList();
         this.requiresDiamondTool = IntLists.emptyList();
 
-        this.axolotlTemptItems = IntLists.emptyList();
+        this.axolotlFood = IntLists.emptyList();
         this.creeperIgniters = IntLists.emptyList();
         this.fishes = IntLists.emptyList();
         this.flowers = IntLists.emptyList();
@@ -143,8 +143,8 @@ public class TagCache {
         this.snifferFood = IntLists.emptyList();
     }
 
-    public boolean isAxolotlTemptItem(Item item) {
-        return axolotlTemptItems.contains(item.javaId());
+    public boolean isAxolotlFood(Item item) {
+        return axolotlFood.contains(item.javaId());
     }
 
     public boolean isCreeperIgniter(Item item) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e9fadb577..08c04a84a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ protocol-connection = "3.0.0.Beta1-20240411.165033-128"
 raknet = "1.0.0.CR3-20240416.144209-1"
 blockstateupdater="1.20.80-20240411.142413-1"
 mcauthlib = "d9d773e"
-mcprotocollib = "b2e93c520a" # Revert from jitpack after release
+mcprotocollib = "897eb241b6" # Revert from jitpack after release
 adventure = "4.14.0"
 adventure-platform = "4.3.0"
 junit = "5.9.2"