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

Fix some cases where world time is not passed through the WorldProvider. (#3685)

Browse source
This commit is contained in:
diesieben07 2017-02-11 20:22:25 +01:00 committed by LexManos
parent 3379ee7df2
commit 0e9d741163
3 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
patches/minecraft/net/minecraft/world/World.java.patch
View file

@ -304,18 +304,35 @@
float f3 = (float)(l >> 16 & 255) / 255.0F;
float f4 = (float)(l >> 8 & 255) / 255.0F;
float f5 = (float)(l & 255) / 255.0F;
@@ -1449,6 +1535,11 @@
@@ -1438,20 +1524,25 @@
public float func_72826_c(float p_72826_1_)
{
- return this.field_73011_w.func_76563_a(this.field_72986_A.func_76073_f(), p_72826_1_);
+ return this.field_73011_w.func_76563_a(this.func_72820_D(), p_72826_1_);
}
@SideOnly(Side.CLIENT)
public int func_72853_d()
{
- return this.field_73011_w.func_76559_b(this.field_72986_A.func_76073_f());
+ return this.field_73011_w.func_76559_b(this.func_72820_D());
}
public float func_130001_d()
{
- return WorldProvider.field_111203_a[this.field_73011_w.func_76559_b(this.field_72986_A.func_76073_f())];
+ return field_73011_w.getCurrentMoonPhaseFactor();
+ }
+
+ public float getCurrentMoonPhaseFactorBody()
+ {
return WorldProvider.field_111203_a[this.field_73011_w.func_76559_b(this.field_72986_A.func_76073_f())];
}
+ public float getCurrentMoonPhaseFactorBody()
+ {
+ return WorldProvider.field_111203_a[this.field_73011_w.func_76559_b(this.func_72820_D())];
+ }
+
public float func_72929_e(float p_72929_1_)
{
float f = this.func_72826_c(p_72929_1_);
@@ -1461,6 +1552,12 @@
@SideOnly(Side.CLIENT)
public Vec3d func_72824_f(float p_72824_1_)

20
patches/minecraft/net/minecraft/world/WorldServer.java.patch
View file

@ -51,6 +51,26 @@
return this;
}
@@ -173,8 +183,8 @@
{
if (this.func_82736_K().func_82766_b("doDaylightCycle"))
{
- long i = this.field_72986_A.func_76073_f() + 24000L;
- this.field_72986_A.func_76068_b(i - i % 24000L);
+ long i = this.func_72820_D() + 24000L;
+ this.func_72877_b(i - i % 24000L);
}
this.func_73053_d();
@@ -200,7 +210,7 @@
if (this.func_82736_K().func_82766_b("doDaylightCycle"))
{
- this.field_72986_A.func_76068_b(this.field_72986_A.func_76073_f() + 1L);
+ this.func_72877_b(this.func_72820_D() + 1L);
}
this.field_72984_F.func_76318_c("tickPending");
@@ -214,6 +224,10 @@
this.field_175740_d.func_75528_a();
this.field_72984_F.func_76318_c("portalForcer");

7
patches/minecraft/net/minecraft/world/storage/MapData.java.patch
View file

@ -37,12 +37,15 @@
p_189551_1_.func_74768_a("xCenter", this.field_76201_a);
p_189551_1_.func_74768_a("zCenter", this.field_76199_b);
p_189551_1_.func_74774_a("scale", this.field_76197_d);
@@ -209,7 +219,7 @@
@@ -209,9 +219,9 @@
p_191095_8_ = p_191095_8_ + (p_191095_8_ < 0.0D ? -8.0D : 8.0D);
b2 = (byte)((int)(p_191095_8_ * 16.0D / 360.0D));
- if (this.field_76200_c < 0)
+ if (p_191095_2_.field_73011_w.shouldMapSpin(p_191095_3_, p_191095_4_, p_191095_6_, p_191095_8_))
{
int l = (int)(p_191095_2_.func_72912_H().func_76073_f() / 10L);
- int l = (int)(p_191095_2_.func_72912_H().func_76073_f() / 10L);
+ int l = (int)(p_191095_2_.func_72820_D() / 10L);
b2 = (byte)(l * l * 34187121 + l * 121 >> 15 & 15);
}
}