diff --git a/eaglercraftbungee/src/main/java/net/md_5/bungee/BungeeCord.java b/eaglercraftbungee/src/main/java/net/md_5/bungee/BungeeCord.java index b1a1b86..3ec27eb 100644 --- a/eaglercraftbungee/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/eaglercraftbungee/src/main/java/net/md_5/bungee/BungeeCord.java @@ -274,13 +274,12 @@ public class BungeeCord extends ProxyServer { for (final ListenerInfo info : this.config.getListeners()) { InetSocketAddress sock = info.getHost(); if(info.isWebsocket()) { - int port = 0; try { ServerSocket s = new ServerSocket(0, 0, InetAddress.getByName("127.11.0.1")); sock = new InetSocketAddress("127.11.0.1", s.getLocalPort()); s.close(); } catch(IOException e) { - port = (int) (System.nanoTime() % 64000L + 1025L); + sock = new InetSocketAddress("127.11.0.1",(int) (System.nanoTime() % 64000L + 1025L)); } try { this.wsListeners.add(new WebSocketListener(info, sock, this)); diff --git a/lwjgl-rundir/resources/sounds/ambient/weather/rain1.mp3 b/lwjgl-rundir/resources/sounds/ambient/weather/rain1.mp3 index 128610d..0fc9dfc 100644 Binary files a/lwjgl-rundir/resources/sounds/ambient/weather/rain1.mp3 and b/lwjgl-rundir/resources/sounds/ambient/weather/rain1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/ambient/weather/rain2.mp3 b/lwjgl-rundir/resources/sounds/ambient/weather/rain2.mp3 index a8bc443..1c6b725 100644 Binary files a/lwjgl-rundir/resources/sounds/ambient/weather/rain2.mp3 and b/lwjgl-rundir/resources/sounds/ambient/weather/rain2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/ambient/weather/rain3.mp3 b/lwjgl-rundir/resources/sounds/ambient/weather/rain3.mp3 index 1a7433e..9bbcade 100644 Binary files a/lwjgl-rundir/resources/sounds/ambient/weather/rain3.mp3 and b/lwjgl-rundir/resources/sounds/ambient/weather/rain3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/ambient/weather/rain4.mp3 b/lwjgl-rundir/resources/sounds/ambient/weather/rain4.mp3 index eda95ae..7f324f3 100644 Binary files a/lwjgl-rundir/resources/sounds/ambient/weather/rain4.mp3 and b/lwjgl-rundir/resources/sounds/ambient/weather/rain4.mp3 differ diff --git a/src/main/java/net/minecraft/src/EntityRenderer.java b/src/main/java/net/minecraft/src/EntityRenderer.java index 5a83af1..8246e74 100644 --- a/src/main/java/net/minecraft/src/EntityRenderer.java +++ b/src/main/java/net/minecraft/src/EntityRenderer.java @@ -1175,9 +1175,9 @@ public class EntityRenderer { this.rainSoundCounter = 0; if (var10 > var2.posY + 1.0D && var3.getPrecipitationHeight(MathHelper.floor_double(var2.posX), MathHelper.floor_double(var2.posZ)) > MathHelper.floor_double(var2.posY)) { - this.mc.theWorld.playSound(var8, var10, var12, "ambient.weather.rain", 0.006F, 0.5F, false); + this.mc.theWorld.playSound(var8, var10, var12, "ambient.weather.rain", 0.45F, 0.5F, false); } else { - this.mc.theWorld.playSound(var8, var10, var12, "ambient.weather.rain", 0.012F, 1.0F, false); + this.mc.theWorld.playSound(var8, var10, var12, "ambient.weather.rain", 0.7F, 1.0F, false); } } } diff --git a/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java b/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java index 5701669..7c62632 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java @@ -2046,7 +2046,7 @@ public class EaglerAdapterImpl2 { } break; case VOICE_SIGNAL_ALLOWED: - voiceAvailableStat = streamIn.readBoolean(); + voiceAvailableStat = streamIn.read() == 1; String[] servs = new String[streamIn.read()]; for(int i = 0; i < servs.length; i++) { servs[i] = streamIn.readUTF();