Merge pull request #8 from LocusAzzurro/wings-recipe-and-mechanics-fix

Fix for issue #6
LocusAzzurro · Aug 14, 2021 · 2d7f6d9 · 2d7f6d9
2 parents 3ec8960 + dc22e87
commit 2d7f6d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/org/mineplugin/locusazzurro/icaruswings/items/FeatherWings.java b/src/main/java/org/mineplugin/locusazzurro/icaruswings/items/FeatherWings.java
@@ -46,7 +46,7 @@ public boolean canElytraFly(ItemStack stack, net.minecraft.entity.LivingEntity e
 	public boolean elytraFlightTick(ItemStack stack, net.minecraft.entity.LivingEntity entity, int flightTicks) {
 		if (!entity.level.isClientSide() && (flightTicks + 1) % 20 == 0) {
 			int dmg = 1;
-			if (entity instanceof PlayerEntity) {
+			if ((entity instanceof PlayerEntity) && (stack.getItem() instanceof FeatherWings)) {
 				if (entity.level.dimension() == World.NETHER) {
 					dmg = 5;
 					if(((FeatherWings)stack.getItem()).getType() != WingsType.FEATHER_GOLDEN)

diff --git a/src/main/resources/data/locusazzurro_icaruswings/recipes/golden_feather_wings.json b/src/main/resources/data/locusazzurro_icaruswings/recipes/golden_feather_wings.json
@@ -17,7 +17,7 @@
     }
   },
   "result": {
-    "item": "locusazzurro_icaruswings:colored_feather_wings",
+    "item": "locusazzurro_icaruswings:golden_feather_wings",
     "count": 1
   }
 }