twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-26 18:03:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2018-07-15 10:00:00 +10:00
parent debc7172fd
commit 767e4f6ccf
199 changed files with 8301 additions and 3637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
paper-api/src/main/java/org/bukkit/potion/PotionEffectType.java
View File

@@ -147,6 +147,21 @@ public abstract class PotionEffectType {
*/
public static final PotionEffectType UNLUCK = new PotionEffectTypeWrapper(27);
/**
* Slows entity fall rate.
*/
public static final PotionEffectType SLOW_FALLING = new PotionEffectTypeWrapper(28);
/**
* Effects granted by a nearby conduit. Includes enhanced underwater abilities.
*/
public static final PotionEffectType CONDUIT_POWER = new PotionEffectTypeWrapper(29);
/**
* Squee'ek uh'k kk'kkkk squeek eee'eek.
*/
public static final PotionEffectType DOLPHINS_GRACE = new PotionEffectTypeWrapper(29);
private final int id;
protected PotionEffectType(int id) {
@@ -230,7 +245,7 @@ public abstract class PotionEffectType {
return "PotionEffectType[" + id + ", " + getName() + "]";
}
private static final PotionEffectType[] byId = new PotionEffectType[28];
private static final PotionEffectType[] byId = new PotionEffectType[31];
private static final Map<String, PotionEffectType> byName = new HashMap<String, PotionEffectType>();
// will break on updates.
private static boolean acceptingNew = true;

6
paper-api/src/main/java/org/bukkit/potion/PotionType.java
View File

@@ -15,7 +15,7 @@ public enum PotionType {
JUMP(PotionEffectType.JUMP, true, true),
FIRE_RESISTANCE(PotionEffectType.FIRE_RESISTANCE, false, true),
SPEED(PotionEffectType.SPEED, true, true),
SLOWNESS(PotionEffectType.SLOW, false, true),
SLOWNESS(PotionEffectType.SLOW, true, true),
WATER_BREATHING(PotionEffectType.WATER_BREATHING, false, true),
INSTANT_HEAL(PotionEffectType.HEAL, true, false),
INSTANT_DAMAGE(PotionEffectType.HARM, true, false),
@@ -23,7 +23,9 @@ public enum PotionType {
REGEN(PotionEffectType.REGENERATION, true, true),
STRENGTH(PotionEffectType.INCREASE_DAMAGE, true, true),
WEAKNESS(PotionEffectType.WEAKNESS, false, true),
LUCK(PotionEffectType.LUCK, false, false);
LUCK(PotionEffectType.LUCK, false, false),
TURTLE_MASTER(PotionEffectType.SLOW, true, true), // TODO: multiple effects
SLOW_FALLING(PotionEffectType.SLOW_FALLING, false, true),
;
private final PotionEffectType effect;