keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix Fireworks to always work in SMP

Browse source
This commit is contained in:
Christian 2012-12-22 07:09:21 -05:00
parent 51c19dd5f1
commit ca881a8153
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
patches/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX.java.patch Normal file
View file

@ -0,0 +1,16 @@
--- ../src_base/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX.java
+++ ../src_work/minecraft/net/minecraft/client/particle/EntityFireworkStarterFX.java
@@ -30,11 +30,11 @@
{
this.field_92039_az = par15NBTTagCompound.getTagList("Explosions");
- if (this.field_92039_az.tagCount() == 0)
+ if (this.field_92039_az != null && this.field_92039_az.tagCount() == 0)
{
this.field_92039_az = null;
}
- else
+ else if (this.field_92039_az != null)
{
this.particleMaxAge = this.field_92039_az.tagCount() * 2 - 1;

26
patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch Normal file
View file

@ -0,0 +1,26 @@
--- ../src_base/minecraft/net/minecraft/item/crafting/RecipeFireworks.java
+++ ../src_work/minecraft/net/minecraft/item/crafting/RecipeFireworks.java
@@ -91,9 +91,9 @@
{
this.field_92050_a = new ItemStack(Item.field_92052_bU);
+ var15 = new NBTTagCompound();
if (var6 > 0)
{
- var15 = new NBTTagCompound();
var18 = new NBTTagCompound("Fireworks");
NBTTagList var25 = new NBTTagList("Explosions");
@@ -110,9 +110,9 @@
var18.setTag("Explosions", var25);
var18.setByte("Flight", (byte)var4);
var15.setTag("Fireworks", var18);
- this.field_92050_a.setTagCompound(var15);
- }
-
+ }
+
+ this.field_92050_a.setTagCompound(var15);
return true;
}
else if (var4 == 1 && var3 == 0 && var6 == 0 && var5 > 0 && var8 <= 1)