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

Merge remote-tracking branch 'origin/pr/3089' into 1.10.x

This commit is contained in:
cpw 2016-07-28 18:43:40 -04:00
parent 5d9169db0f db2f5ab416
commit 46cfaae3db
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch
View File

@ -16,7 +16,15 @@
}
private synchronized void func_148608_i()
@@ -338,6 +340,9 @@
@@ -205,6 +207,7 @@
this.field_148620_e.stop(s);
}
+ this.field_189000_p.clear(); //Forge: MC-35856 Fixed paused sounds repeating when switching worlds
this.field_148629_h.clear();
this.field_148626_m.clear();
this.field_148625_l.clear();
@@ -338,6 +341,9 @@
{
if (this.field_148617_f)
{
@ -26,7 +34,7 @@
SoundEventAccessor soundeventaccessor = p_148611_1_.func_184366_a(this.field_148622_c);
ResourceLocation resourcelocation = p_148611_1_.func_147650_b();
@@ -400,10 +405,12 @@
@@ -400,10 +406,12 @@
if (sound.func_188723_h())
{
this.field_148620_e.newStreamingSource(false, s, func_148612_a(resourcelocation1), resourcelocation1.toString(), flag, p_148611_1_.func_147649_g(), p_148611_1_.func_147654_h(), p_148611_1_.func_147651_i(), p_148611_1_.func_147656_j().func_148586_a(), f);