Fixed EffectRenderer patch, closes #2547.
This commit is contained in:
parent
12c051d52b
commit
4189f63905
1 changed files with 4 additions and 14 deletions
|
@ -1,16 +1,6 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/client/particle/EffectRenderer.java
|
--- ../src-base/minecraft/net/minecraft/client/particle/EffectRenderer.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/particle/EffectRenderer.java
|
+++ ../src-work/minecraft/net/minecraft/client/particle/EffectRenderer.java
|
||||||
@@ -3,6 +3,9 @@
|
@@ -143,6 +143,7 @@
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.common.collect.Maps;
|
|
||||||
import com.google.common.collect.Queues;
|
|
||||||
+
|
|
||||||
+import akka.actor.FSM.State;
|
|
||||||
+
|
|
||||||
import java.util.ArrayDeque;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
@@ -143,6 +146,7 @@
|
|
||||||
|
|
||||||
public void func_78873_a(EntityFX p_78873_1_)
|
public void func_78873_a(EntityFX p_78873_1_)
|
||||||
{
|
{
|
||||||
|
@ -18,16 +8,16 @@
|
||||||
this.field_187241_h.add(p_78873_1_);
|
this.field_187241_h.add(p_78873_1_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -376,7 +380,7 @@
|
@@ -376,7 +377,7 @@
|
||||||
|
|
||||||
public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
|
public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
|
||||||
{
|
{
|
||||||
- if (p_180533_2_.func_185904_a() != Material.field_151579_a)
|
- if (p_180533_2_.func_185904_a() != Material.field_151579_a)
|
||||||
+ if (p_180533_2_.func_177230_c().isAir(p_180533_2_, field_78878_a, p_180533_1_) && !p_180533_2_.func_177230_c().addDestroyEffects(field_78878_a, p_180533_1_, this))
|
+ if (!p_180533_2_.func_177230_c().isAir(p_180533_2_, field_78878_a, p_180533_1_) && !p_180533_2_.func_177230_c().addDestroyEffects(field_78878_a, p_180533_1_, this))
|
||||||
{
|
{
|
||||||
p_180533_2_ = p_180533_2_.func_185899_b(this.field_78878_a, p_180533_1_);
|
p_180533_2_ = p_180533_2_.func_185899_b(this.field_78878_a, p_180533_1_);
|
||||||
int i = 4;
|
int i = 4;
|
||||||
@@ -460,4 +464,13 @@
|
@@ -460,4 +461,13 @@
|
||||||
|
|
||||||
return "" + i;
|
return "" + i;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue