Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Implement getColor / setColor for TippedArrow

Browse Source
This commit is contained in:
Matthew 2017-04-26 20:28:27 -04:00
parent 2453830549
commit 55a1f9ff12
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nms-patches/EntityTippedArrow.patch
View File

@ -1,9 +1,10 @@
--- a/net/minecraft/server/EntityTippedArrow.java --- a/net/minecraft/server/EntityTippedArrow.java
+++ b/net/minecraft/server/EntityTippedArrow.java +++ b/net/minecraft/server/EntityTippedArrow.java
@@ -116,6 +116,25 @@ @@ -116,11 +116,30 @@
} }
} }
- public int o() {
+ // CraftBukkit start accessor methods + // CraftBukkit start accessor methods
+ public void refreshEffects() { + public void refreshEffects() {
+ this.getDataWatcher().set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects)))); + this.getDataWatcher().set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects))));
@ -23,6 +24,12 @@
+ } + }
+ // CraftBukkit end + // CraftBukkit end
+ +
public int o() { + public int o() { // PAIL: rename getColor
return ((Integer) this.datawatcher.get(EntityTippedArrow.f)).intValue(); return ((Integer) this.datawatcher.get(EntityTippedArrow.f)).intValue();
} }
- private void d(int i) {
+ public void d(int i) { // PAIL: private -> public, rename setColor
this.at = true;
this.datawatcher.set(EntityTippedArrow.f, Integer.valueOf(i));
}

11
src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
View File

@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.entity;
import java.util.List; import java.util.List;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Color;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.potion.CraftPotionUtil; import org.bukkit.craftbukkit.potion.CraftPotionUtil;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -119,4 +120,14 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
public PotionData getBasePotionData() { public PotionData getBasePotionData() {
return CraftPotionUtil.toBukkit(getHandle().getType()); return CraftPotionUtil.toBukkit(getHandle().getType());
} }
@Override
public void setColor(Color color) {
getHandle().d(color.asRGB());
}
@Override
public Color getColor() {
return Color.fromRGB(getHandle().o());
}
} }