OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-11 01:12:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5231: ShotAtAngle API for Fireworks

Browse source
This commit is contained in:
md_5 2019-08-02 19:32:10 +10:00
parent 7881d2ae15
commit 803eaa3169
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nms-patches/EntityFireworks.patch
View file

@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityFireworks.java --- a/net/minecraft/server/EntityFireworks.java
+++ b/net/minecraft/server/EntityFireworks.java +++ b/net/minecraft/server/EntityFireworks.java
@@ -3,6 +3,7 @@ @@ -3,12 +3,13 @@
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.OptionalInt; import java.util.OptionalInt;
@ -8,6 +8,13 @@
public class EntityFireworks extends Entity implements IProjectile { public class EntityFireworks extends Entity implements IProjectile {
public static final DataWatcherObject<ItemStack> FIREWORK_ITEM = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.g);
private static final DataWatcherObject<OptionalInt> c = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.r);
- private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.i);
+ public static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityFireworks.class, DataWatcherRegistry.i); // PAIL
private int ticksFlown;
public int expectedLifespan;
private EntityLiving ridingEntity;
@@ -133,7 +134,11 @@ @@ -133,7 +134,11 @@
} }

10
src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
View file

@ -68,4 +68,14 @@ public class CraftFirework extends CraftEntity implements Firework {
public void detonate() { public void detonate() {
getHandle().expectedLifespan = 0; getHandle().expectedLifespan = 0;
} }
@Override
public boolean isShotAtAngle() {
return getHandle().i();
}
@Override
public void setShotAtAngle(boolean shotAtAngle) {
getHandle().getDataWatcher().set(EntityFireworks.d, shotAtAngle);
}
} }