TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add 1.6 Potion Effects. Thanks @bloodsplat for pointing this out.

Browse source
This commit is contained in:
md_5 2013-07-08 12:37:44 +10:00
parent 0bab96762d
commit b5ee9871fb
2 changed files with 74 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Bukkit-Patches/0013-Add-1.6-Potion-Effects.patch Normal file
View file

@ -0,0 +1,46 @@
From d2c9c65d41116c92c03c09aa6f90ab080358ffc2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 8 Jul 2013 12:37:21 +1000
Subject: [PATCH] Add 1.6 Potion Effects
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
index 536e59b..855bda1 100644
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java
+++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
@@ -108,6 +108,32 @@ public abstract class PotionEffectType {
* Deals damage to an entity over time and gives the health to the shooter.
*/
public static final PotionEffectType WITHER = new PotionEffectTypeWrapper(20);
+ // Spigot Start
+ /**
+ * Adds 4 HP points.
+ *
+ * @deprecated this is a Spigot API which may be subject to removal or
+ * change pending Bukkit addition.
+ */
+ @Deprecated
+ public static final PotionEffectType HEALTH_BOOST = new PotionEffectTypeWrapper( 21 );
+ /**
+ * Adds 4 absorption HP which absorb damage inflicted.
+ *
+ * @deprecated this is a Spigot API which may be subject to removal or
+ * change pending Bukkit addition.
+ */
+ @Deprecated
+ public static final PotionEffectType ABSORPTION = new PotionEffectTypeWrapper( 22 );
+ /**
+ * Causes the food meter to be replenished by 1 point each tick.
+ *
+ * @deprecated this is a Spigot API which may be subject to removal or
+ * change pending Bukkit addition.
+ */
+ @Deprecated
+ public static final PotionEffectType SATURATION = new PotionEffectTypeWrapper( 23 );
+ // Spigot End
private final int id;
--
1.8.1.2

28
CraftBukkit-Patches/0066-Add-1.6-Potion-Effects.patch Normal file
View file

@ -0,0 +1,28 @@
From 77f73822be50a7878ad4caa37a92fc008aace1c1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 8 Jul 2013 12:37:24 +1000
Subject: [PATCH] Add 1.6 Potion Effects
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
index 900dc7d..2ef2bb2 100644
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
@@ -64,6 +64,14 @@ public class CraftPotionEffectType extends PotionEffectType {
return "POISON";
case 20:
return "WITHER";
+ // Spigot Start
+ case 21:
+ return "HEALTH_BOOST";
+ case 22:
+ return "ABSORPTION";
+ case 23:
+ return "SATURATION";
+ // Spigot End
default:
return "UNKNOWN_EFFECT_TYPE_" + handle.id;
}
--
1.8.1.2