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

Update firework power when modifying meta. Fixes BUKKIT-3272

Browse source
This commit is contained in:
Travis Watkins 2012-12-22 13:05:55 -06:00
parent f72a08c22e
commit 717fbbeffa
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityFireworks.java
View file

@ -3,7 +3,7 @@ package net.minecraft.server;
public class EntityFireworks extends Entity {
private int a;
private int b;
public int b; // CraftBukkit - private -> public
public EntityFireworks(World world) {
super(world);

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

@ -11,6 +11,8 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Firework;
import org.bukkit.inventory.meta.FireworkMeta;
import java.util.Random;
public class CraftFirework extends CraftEntity implements Firework {
private static final int FIREWORK_ITEM_INDEX = 8;
@ -54,5 +56,9 @@ public class CraftFirework extends CraftEntity implements Firework {
public void setFireworkMeta(FireworkMeta meta) {
item.setItemMeta(meta);
// Copied from EntityFireworks constructor, update firework lifetime/power
Random random = new Random();
getHandle().b = 10 * meta.getPower() + random.nextInt(6) + random.nextInt(7);
}
}