Fix potions. Fixes #2813, #2814

2025-06-27 03:04:44 +02:00 · 2016-03-16 00:39:23 -05:00
parent 1488946fc5
commit ec774b590b
7 changed files with 103 additions and 27 deletions
--- a/src/main/resources/potions.yml
+++ b/src/main/resources/potions.yml
@ -405,6 +405,16 @@ Potions:
            SULPHUR: SPLASH_POTION_OF_HASTE
            REDSTONE: POTION_OF_HASTE_EXTENDED
            GLOWSTONE_DUST: POTION_OF_HASTE_II
+    POTION_OF_HEALTH_BOOST:
+        Name: Potion Of Health Boost
+        Material: POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 0 1800"]
+        Children:
+            GLOWSTONE_DUST: POTION_OF_HEALTH_BOOST_II
+            SULPHUR: SPLASH_POTION_OF_HEALTH_BOOST
+            REDSTONE: POTION_OF_HEALTH_BOOST_EXTENDED
    POTION_OF_HUNGER:
        Name: Potion Of Hunger
        Material: POTION
@ -475,6 +485,12 @@ Potions:
        PotionData:
            PotionType: UNCRAFTABLE
        Effects: ["FAST_DIGGING 0 7200"]
+    POTION_OF_HEALTH_BOOST_EXTENDED:
+        Name: Potion Of Health Boost Extended
+        Material: POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 0 3600"]
    POTION_OF_HUNGER_EXTENDED:
        Name: Potion Of Hunger Extended
        Material: POTION
@ -529,6 +545,12 @@ Potions:
        PotionData:
            PotionType: UNCRAFTABLE
        Effects: ["FAST_DIGGING 1 1800"]
+    POTION_OF_HEALTH_BOOST_II:
+        Name: Potion Of Health Boost II
+        Material: POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 1 900"]
    POTION_OF_HUNGER_II:
        Name: Potion Of Hunger II
        Material: POTION
@ -862,9 +884,9 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["ABSORPTION 0 1350"]
        Children:
-            REDSTONE: SPLASH_POTION_OF_ABSORPTION_EXTENDED
-            GLOWSTONE_DUST: SPLASH_POTION_OF_ABSORPTION_II
            DRAGONS_BREATH: LINGERING_POTION_OF_ABSORPTION
+            GLOWSTONE_DUST: SPLASH_POTION_OF_ABSORPTION_II
+            REDSTONE: SPLASH_POTION_OF_ABSORPTION_EXTENDED
    SPLASH_POTION_OF_BLINDNESS:
        Name: Splash Potion Of Blindness
        Material: SPLASH_POTION
@ -872,9 +894,9 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["BLINDNESS 0 168"]
        Children:
-            DRAGONS_BREATH: LINGERING_POTION_OF_BLINDNESS
-            REDSTONE: SPLASH_POTION_OF_BLINDNESS_EXTENDED
            GLOWSTONE_DUST: SPLASH_POTION_OF_BLINDNESS_II
+            REDSTONE: SPLASH_POTION_OF_BLINDNESS_EXTENDED
+            DRAGONS_BREATH: LINGERING_POTION_OF_BLINDNESS
    SPLASH_POTION_OF_DECAY:
        Name: Splash Potion Of Decay
        Material: SPLASH_POTION
@ -902,9 +924,19 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["FAST_DIGGING 0 2700"]
        Children:
+            GLOWSTONE_DUST: SPLASH_POTION_OF_HASTE_II
            DRAGONS_BREATH: LINGERING_POTION_OF_HASTE
            REDSTONE: SPLASH_POTION_OF_HASTE_EXTENDED
-            GLOWSTONE_DUST: SPLASH_POTION_OF_HASTE_II
+    SPLASH_POTION_OF_HEALTH_BOOST:
+        Name: Splash Potion Of Health Boost
+        Material: SPLASH_POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 0 1350"]
+        Children:
+            GLOWSTONE_DUST: SPLASH_POTION_OF_HEALTH_BOOST_II
+            REDSTONE: SPLASH_POTION_OF_HEALTH_BOOST_EXTENDED
+            DRAGONS_BREATH: LINGERING_POTION_OF_HEALTH_BOOST
    SPLASH_POTION_OF_HUNGER:
        Name: Splash Potion Of Hunger
        Material: SPLASH_POTION
@ -912,8 +944,8 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["HUNGER 0 675"]
        Children:
-            GLOWSTONE_DUST: SPLASH_POTION_OF_HUNGER_II
            REDSTONE: SPLASH_POTION_OF_HUNGER_EXTENDED
+            GLOWSTONE_DUST: SPLASH_POTION_OF_HUNGER_II
            DRAGONS_BREATH: LINGERING_POTION_OF_HUNGER
    SPLASH_POTION_OF_NAUSEA:
        Name: Splash Potion Of Nausea
@ -922,9 +954,9 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["CONFUSION 0 337"]
        Children:
-            GLOWSTONE_DUST: SPLASH_POTION_OF_NAUSEA_II
            DRAGONS_BREATH: LINGERING_POTION_OF_NAUSEA
            REDSTONE: SPLASH_POTION_OF_NAUSEA_EXTENDED
+            GLOWSTONE_DUST: SPLASH_POTION_OF_NAUSEA_II
    SPLASH_POTION_OF_RESISTANCE:
        Name: Splash Potion Of Resistance
        Material: SPLASH_POTION
@ -932,9 +964,9 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["DAMAGE_RESISTANCE 0 337"]
        Children:
-            GLOWSTONE_DUST: SPLASH_POTION_OF_RESISTANCE_II
            DRAGONS_BREATH: LINGERING_POTION_OF_RESISTANCE
            REDSTONE: SPLASH_POTION_OF_RESISTANCE_EXTENDED
+            GLOWSTONE_DUST: SPLASH_POTION_OF_RESISTANCE_II
    SPLASH_POTION_OF_SATURATION:
        Name: Splash Potion Of Saturation
        Material: SPLASH_POTION
@ -975,6 +1007,12 @@ Potions:
        PotionData:
            PotionType: UNCRAFTABLE
        Effects: ["FAST_DIGGING 0 5400"]
+    SPLASH_POTION_OF_HEALTH_BOOST_EXTENDED:
+        Name: Splash Potion Of Health Boost Extended
+        Material: SPLASH_POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 0 2700"]
    SPLASH_POTION_OF_HUNGER_EXTENDED:
        Name: Splash Potion Of Hunger Extended
        Material: SPLASH_POTION
@ -1029,6 +1067,12 @@ Potions:
        PotionData:
            PotionType: UNCRAFTABLE
        Effects: ["FAST_DIGGING 1 1350"]
+    SPLASH_POTION_OF_HEALTH_BOOST_II:
+        Name: Splash Potion Of Health Boost II
+        Material: SPLASH_POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 1 675"]
    SPLASH_POTION_OF_HUNGER_II:
        Name: Splash Potion Of Hunger II
        Material: SPLASH_POTION
@ -1310,8 +1354,8 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["ABSORPTION 0 450"]
        Children:
-            REDSTONE: LINGERING_POTION_OF_ABSORPTION_EXTENDED
            GLOWSTONE_DUST: LINGERING_POTION_OF_ABSORPTION_II
+            REDSTONE: LINGERING_POTION_OF_ABSORPTION_EXTENDED
    LINGERING_POTION_OF_BLINDNESS:
        Name: Lingering Potion Of Blindness
        Material: LINGERING_POTION
@ -1319,8 +1363,8 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["BLINDNESS 0 56"]
        Children:
-            GLOWSTONE_DUST: LINGERING_POTION_OF_BLINDNESS_II
            REDSTONE: LINGERING_POTION_OF_BLINDNESS_EXTENDED
+            GLOWSTONE_DUST: LINGERING_POTION_OF_BLINDNESS_II
    LINGERING_POTION_OF_DECAY:
        Name: Lingering Potion Of Decay
        Material: LINGERING_POTION
@ -1328,8 +1372,8 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["WITHER 0 112"]
        Children:
-            REDSTONE: LINGERING_POTION_OF_DECAY_EXTENDED
            GLOWSTONE_DUST: LINGERING_POTION_OF_DECAY_II
+            REDSTONE: LINGERING_POTION_OF_DECAY_EXTENDED
    LINGERING_POTION_OF_DULLNESS:
        Name: Lingering Potion Of Dullness
        Material: LINGERING_POTION
@ -1337,8 +1381,8 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["SLOW_DIGGING 0 900"]
        Children:
-            GLOWSTONE_DUST: LINGERING_POTION_OF_DULLNESS_II
            REDSTONE: LINGERING_POTION_OF_DULLNESS_EXTENDED
+            GLOWSTONE_DUST: LINGERING_POTION_OF_DULLNESS_II
    LINGERING_POTION_OF_HASTE:
        Name: Lingering Potion Of Haste
        Material: LINGERING_POTION
@ -1348,6 +1392,15 @@ Potions:
        Children:
            GLOWSTONE_DUST: LINGERING_POTION_OF_HASTE_II
            REDSTONE: LINGERING_POTION_OF_HASTE_EXTENDED
+    LINGERING_POTION_OF_HEALTH_BOOST:
+        Name: Lingering Potion Of Health Boost
+        Material: LINGERING_POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 0 450"]
+        Children:
+            GLOWSTONE_DUST: LINGERING_POTION_OF_HEALTH_BOOST_II
+            REDSTONE: LINGERING_POTION_OF_HEALTH_BOOST_EXTENDED
    LINGERING_POTION_OF_HUNGER:
        Name: Lingering Potion Of Hunger
        Material: LINGERING_POTION
@ -1355,8 +1408,8 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["HUNGER 0 225"]
        Children:
-            REDSTONE: LINGERING_POTION_OF_HUNGER_EXTENDED
            GLOWSTONE_DUST: LINGERING_POTION_OF_HUNGER_II
+            REDSTONE: LINGERING_POTION_OF_HUNGER_EXTENDED
    LINGERING_POTION_OF_NAUSEA:
        Name: Lingering Potion Of Nausea
        Material: LINGERING_POTION
@ -1373,8 +1426,8 @@ Potions:
            PotionType: UNCRAFTABLE
        Effects: ["DAMAGE_RESISTANCE 0 112"]
        Children:
-            GLOWSTONE_DUST: LINGERING_POTION_OF_RESISTANCE_II
            REDSTONE: LINGERING_POTION_OF_RESISTANCE_EXTENDED
+            GLOWSTONE_DUST: LINGERING_POTION_OF_RESISTANCE_II
    LINGERING_POTION_OF_SATURATION:
        Name: Lingering Potion Of Saturation
        Material: LINGERING_POTION
@ -1414,6 +1467,12 @@ Potions:
        PotionData:
            PotionType: UNCRAFTABLE
        Effects: ["FAST_DIGGING 0 1800"]
+    LINGERING_POTION_OF_HEALTH_BOOST_EXTENDED:
+        Name: Lingering Potion Of Health Boost Extended
+        Material: LINGERING_POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 0 900"]
    LINGERING_POTION_OF_HUNGER_EXTENDED:
        Name: Lingering Potion Of Hunger Extended
        Material: LINGERING_POTION
@ -1468,6 +1527,12 @@ Potions:
        PotionData:
            PotionType: UNCRAFTABLE
        Effects: ["FAST_DIGGING 1 450"]
+    LINGERING_POTION_OF_HEALTH_BOOST_II:
+        Name: Lingering Potion Of Health Boost II
+        Material: LINGERING_POTION
+        PotionData:
+            PotionType: UNCRAFTABLE
+        Effects: ["HEALTH_BOOST 1 225"]
    LINGERING_POTION_OF_HUNGER_II:
        Name: Lingering Potion Of Hunger II
        Material: LINGERING_POTION
@ -1492,3 +1557,4 @@ Potions:
        PotionData:
            PotionType: UNCRAFTABLE
        Effects: ["SATURATION 1 1"]
+