117 lines
4.8 KiB
Diff
117 lines
4.8 KiB
Diff
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
|
|
--- minecraft\net\minecraft\client\Minecraft.java Fri Mar 30 23:25:51 2012
|
|
+++ minecraft_patched\net\minecraft\client\Minecraft.java Fri Mar 30 23:38:36 2012
|
|
@@ -1618,11 +1618,13 @@
|
|
|
|
this.field_6324_e.func_600_a(var6.field_22395_a + var10, 64, var6.field_22396_c + var8);
|
|
if(!this.field_6327_b.func_35643_e()) {
|
|
+/*
|
|
while(true) {
|
|
if(this.field_6324_e.func_6465_g()) {
|
|
continue;
|
|
}
|
|
}
|
|
+*/
|
|
}
|
|
}
|
|
}
|
|
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
|
|
--- minecraft\net\minecraft\src\CodecMus.java Fri Mar 30 23:25:52 2012
|
|
+++ minecraft_patched\net\minecraft\src\CodecMus.java Fri Mar 30 23:38:36 2012
|
|
@@ -1,5 +1,6 @@
|
|
package net.minecraft.src;
|
|
|
|
+import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import net.minecraft.src.MusInputStream;
|
|
import paulscode.sound.codecs.CodecJOrbis;
|
|
@@ -7,6 +8,11 @@
|
|
public class CodecMus extends CodecJOrbis {
|
|
|
|
protected InputStream openInputStream() {
|
|
+ try {
|
|
return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
|
|
+ }
|
|
+ catch (IOException e) {
|
|
+ return null;
|
|
+ }
|
|
}
|
|
}
|
|
diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
|
|
--- minecraft\net\minecraft\src\ItemMap.java Fri Mar 30 23:25:53 2012
|
|
+++ minecraft_patched\net\minecraft\src\ItemMap.java Fri Mar 30 23:38:36 2012
|
|
@@ -19,7 +19,6 @@
|
|
}
|
|
|
|
public static MapData func_28013_a(short p_28013_0_, World p_28013_1_) {
|
|
- "map_" + p_28013_0_;
|
|
MapData var3 = (MapData)p_28013_1_.func_28103_a(MapData.class, "map_" + p_28013_0_);
|
|
if(var3 == null) {
|
|
int var4 = p_28013_1_.func_28101_b("map");
|
|
@@ -32,7 +31,6 @@
|
|
}
|
|
|
|
public MapData func_28012_a(ItemStack p_28012_1_, World p_28012_2_) {
|
|
- "map_" + p_28012_1_.func_21181_i();
|
|
MapData var4 = (MapData)p_28012_2_.func_28103_a(MapData.class, "map_" + p_28012_1_.func_21181_i());
|
|
if(var4 == null) {
|
|
p_28012_1_.func_28156_b(p_28012_2_.func_28101_b("map"));
|
|
diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
|
|
--- minecraft\net\minecraft\src\MusInputStream.java Fri Mar 30 23:25:54 2012
|
|
+++ minecraft_patched\net\minecraft\src\MusInputStream.java Fri Mar 30 23:38:36 2012
|
|
@@ -1,5 +1,6 @@
|
|
package net.minecraft.src;
|
|
|
|
+import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.net.URL;
|
|
import net.minecraft.src.CodecMus;
|
|
@@ -27,7 +28,12 @@
|
|
}
|
|
|
|
public int read(byte[] p_read_1_, int p_read_2_, int p_read_3_) {
|
|
+ try {
|
|
p_read_3_ = this.field_1515_d.read(p_read_1_, p_read_2_, p_read_3_);
|
|
+ }
|
|
+ catch (IOException e) {
|
|
+ return 0;
|
|
+ }
|
|
|
|
for(int var4 = 0; var4 < p_read_3_; ++var4) {
|
|
byte var5 = p_read_1_[p_read_2_ + var4] = (byte)(p_read_1_[p_read_2_ + var4] ^ this.field_1516_c >> 8);
|
|
diff -r -U 3 minecraft\net\minecraft\src\NetworkMasterThread.java minecraft_patched\net\minecraft\src\NetworkMasterThread.java
|
|
--- minecraft\net\minecraft\src\NetworkMasterThread.java Fri Mar 30 23:25:54 2012
|
|
+++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java Fri Mar 30 23:38:36 2012
|
|
@@ -11,6 +11,7 @@
|
|
this.field_1086_a = p_i570_1_;
|
|
}
|
|
|
|
+ @SuppressWarnings("deprecation")
|
|
public void run() {
|
|
try {
|
|
Thread.sleep(5000L);
|
|
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
|
|
--- minecraft\net\minecraft\src\RenderGlobal.java Fri Mar 30 23:25:54 2012
|
|
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Fri Mar 30 23:38:36 2012
|
|
@@ -1458,7 +1458,7 @@
|
|
double var15 = this.field_1439_t.field_22009_h.field_611_ak - p_40193_2_;
|
|
double var17 = this.field_1439_t.field_22009_h.field_610_al - p_40193_4_;
|
|
double var19 = this.field_1439_t.field_22009_h.field_609_am - p_40193_6_;
|
|
- Object var21 = null;
|
|
+ EntityFX var21 = null;
|
|
if(p_40193_1_.equals("hugeexplosion")) {
|
|
this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, p_40193_2_, p_40193_4_, p_40193_6_, p_40193_8_, p_40193_10_, p_40193_12_));
|
|
} else if(p_40193_1_.equals("largeexplode")) {
|
|
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
|
|
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 30 23:25:55 2012
|
|
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 30 23:38:36 2012
|
|
@@ -20,7 +20,9 @@
|
|
}
|
|
|
|
public void run() {
|
|
+ while (true) {
|
|
this.func_40568_b();
|
|
+ }
|
|
}
|
|
|
|
private void func_40568_b() {
|