SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/nms-patches/EntityTippedArrow.patch
View File

@@ -1,12 +1,12 @@
--- a/net/minecraft/server/EntityTippedArrow.java
+++ b/net/minecraft/server/EntityTippedArrow.java
@@ -115,6 +115,25 @@
@@ -117,6 +117,25 @@
}
}
+ // CraftBukkit start accessor methods
+ public void refreshEffects() {
+ this.getDataWatcher().set(EntityTippedArrow.g, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects))));
+ this.getDataWatcher().set(EntityTippedArrow.COLOR, PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects)));
+ }
+
+ public String getType() {
@@ -15,7 +15,7 @@
+
+ public void setType(String string) {
+ this.potionRegistry = IRegistry.POTION.get(new MinecraftKey(string));
+ this.datawatcher.set(EntityTippedArrow.g, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects))));
+ this.getDataWatcher().set(EntityTippedArrow.COLOR, PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects)));
+ }
+
+ public boolean isTipped() {
@@ -24,9 +24,9 @@
+ // CraftBukkit end
+
public int getColor() {
return (Integer) this.datawatcher.get(EntityTippedArrow.g);
return (Integer) this.datawatcher.get(EntityTippedArrow.COLOR);
}
@@ -179,7 +198,7 @@
@@ -184,7 +203,7 @@
while (iterator.hasNext()) {
mobeffect = (MobEffect) iterator.next();
@@ -35,7 +35,7 @@
}
if (!this.effects.isEmpty()) {
@@ -187,7 +206,7 @@
@@ -192,7 +211,7 @@
while (iterator.hasNext()) {
mobeffect = (MobEffect) iterator.next();