Skip to content
Browse files

Fixing chunk generation and some minor other bugs.

  • Loading branch information...
1 parent eba93cc commit e3d1622ebe6ee256e3a686e16e430d6063e0b913 @Meaglin Meaglin committed
View
4 src/OBlockButton.java
@@ -132,7 +132,7 @@ public boolean a(OWorld paramOWorld, int paramInt1, int paramInt2, int paramInt3
return true;
// hMod: Allow button to provide power
- int change = (Integer) etc.getLoader().callHook(PluginLoader.Hook.REDSTONE_CHANGE, new Block(bk, paramInt1, paramInt2, paramInt3), 0, 1);
+ int change = (Integer) etc.getLoader().callHook(PluginLoader.Hook.REDSTONE_CHANGE, new Block(bl, paramInt1, paramInt2, paramInt3), 0, 1);
if (change == 0)
return true;
@@ -216,7 +216,7 @@ public void a(OWorld paramOWorld, int paramInt1, int paramInt2, int paramInt3, R
return;
// hMod: Allow button to provide power
- int change = (Integer) etc.getLoader().callHook(PluginLoader.Hook.REDSTONE_CHANGE, new Block(bk, paramInt1, paramInt2, paramInt3), 1, 0);
+ int change = (Integer) etc.getLoader().callHook(PluginLoader.Hook.REDSTONE_CHANGE, new Block(bl, paramInt1, paramInt2, paramInt3), 1, 0);
if (change > 0)
return;
View
2 src/OBlockRedstoneWire.java
@@ -216,7 +216,7 @@ public void b(OWorld paramOWorld, int paramInt1, int paramInt2, int paramInt3) {
}
private int f(OWorld paramOWorld, int paramInt1, int paramInt2, int paramInt3, int paramInt4) {
- if (paramOWorld.a(paramInt1, paramInt2, paramInt3) != bk)
+ if (paramOWorld.a(paramInt1, paramInt2, paramInt3) != bl)
return paramInt4;
int i = paramOWorld.b(paramInt1, paramInt2, paramInt3);
if (i > paramInt4)
View
8 src/OEntityItem.java
@@ -36,11 +36,15 @@ public OEntityItem(OWorld paramOWorld) {
protected void a() {
}
+ private long lastcall = System.currentTimeMillis();
+ private static int floor(double d) { int rt = (int) d; return rt > d ? rt-1 : rt; }
@Override
public void f_() {
super.f_();
- if (c > 0)
- c -= 1;
+ if (c > 0) {
+ c -= floor((lastcall - System.currentTimeMillis())/50);
+ lastcall = System.currentTimeMillis();
+ }
aH = aK;
aI = aL;
aJ = aM;
View
2 src/OItemBlock.java
@@ -17,7 +17,7 @@ public boolean a(OItemStack paramOItemStack, OEntityPlayer paramOEntityPlayer, O
int blockClickedId = paramOWorld.a(paramInt1, paramInt2, paramInt3);
Block blockClicked = new Block(blockClickedId, paramInt1, paramInt2, paramInt3);
- if (paramOWorld.a(paramInt1, paramInt2, paramInt3) == OBlock.aS.bk)
+ if (paramOWorld.a(paramInt1, paramInt2, paramInt3) == OBlock.aS.bl)
paramInt4 = 0;
else {
if (paramInt4 == 0)
View
4 src/OMobSpawnerBase.java
@@ -18,8 +18,8 @@
public static final OMobSpawnerBase l = new OMobSpawnerHell().b(16711680).a("Hell");
public String m;
public int n;
- public byte o = (byte) OBlock.u.bk;
- public byte p = (byte) OBlock.v.bk;
+ public byte o = (byte) OBlock.u.bl;
+ public byte p = (byte) OBlock.v.bl;
public int q = 5169201;
protected List r = new ArrayList();
View
8 src/OServerConfigurationManager.java
@@ -69,7 +69,7 @@ public void a(OEntityPlayerMP paramOEntityPlayerMP) {
b.add(paramOEntityPlayerMP);
n.b(paramOEntityPlayerMP);
- c.e.u.d((int) paramOEntityPlayerMP.aK >> 4, (int) paramOEntityPlayerMP.aM >> 4);
+ c.e.u.c((int) paramOEntityPlayerMP.aK >> 4, (int) paramOEntityPlayerMP.aM >> 4);
while (c.e.a(paramOEntityPlayerMP, paramOEntityPlayerMP.aU).size() != 0)
paramOEntityPlayerMP.a(paramOEntityPlayerMP.aK, paramOEntityPlayerMP.aL + 1.0D, paramOEntityPlayerMP.aM);
@@ -208,7 +208,7 @@ public OEntityPlayerMP d(OEntityPlayerMP paramOEntityPlayerMP) {
}
- c.e.u.d((int) localOEntityPlayerMP.aK >> 4, (int) localOEntityPlayerMP.aM >> 4);
+ c.e.u.c((int) localOEntityPlayerMP.aK >> 4, (int) localOEntityPlayerMP.aM >> 4);
while (c.e.a(localOEntityPlayerMP, localOEntityPlayerMP.aU).size() != 0)
localOEntityPlayerMP.a(localOEntityPlayerMP.aK, localOEntityPlayerMP.aL + 1.0D, localOEntityPlayerMP.aM);
@@ -220,8 +220,8 @@ public OEntityPlayerMP d(OEntityPlayerMP paramOEntityPlayerMP) {
c.e.a(localOEntityPlayerMP);
b.add(localOEntityPlayerMP);
- localOEntityPlayerMP.l();
- localOEntityPlayerMP.s();
+ localOEntityPlayerMP.m();
+ localOEntityPlayerMP.t();
return localOEntityPlayerMP;
}
View
2 src/OTileEntityFurnace.java
@@ -197,7 +197,7 @@ private int a(OItemStack paramOItemStack) {
if ((i < 256) && (OBlock.m[i].bw == OMaterial.c))
return 300;
- if (i == OItem.k.bd)
+ if (i == OItem.B.bd)
return 100;
if (i == OItem.k.bd)

0 comments on commit e3d1622

Please sign in to comment.
Something went wrong with that request. Please try again.