xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Update to Forge 10.13.3.1388. Small fixes.

Browse Source
This commit is contained in:
gamerforEA
2015-04-24 15:40:52 +03:00
parent 8bd7ff1755
commit d5cf443039
23 changed files with 237 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/net/minecraft/world/World.java.patch
View File

@ -62,7 +62,7 @@
public abstract class World implements IBlockAccess
{
/**
@@ -83,10 +128,10 @@
@@ -83,15 +128,14 @@
public boolean scheduledUpdatesAreImmediate;
public List loadedEntityList = new ArrayList();
@ -75,11 +75,17 @@
public List playerEntities = new ArrayList();
public List weatherEffects = new ArrayList();
private long cloudColour = 16777215L;
@@ -100,26 +145,87 @@
public int skylightSubtracted;
- protected int updateLCG = (new Random()).nextInt();
protected final int DIST_HASH_MAGIC = 1013904223;
public float prevRainingStrength;
public float rainingStrength;
@@ -100,26 +144,88 @@
public int lastLightningBolt;
public EnumDifficulty difficultySetting;
public Random rand = new Random();
- public final WorldProvider provider;
+ protected int updateLCG = this.rand.nextInt();
+ public WorldProvider provider; // CraftBukkit - remove final
protected List worldAccesses = new ArrayList();
- protected IChunkProvider chunkProvider;

9
patches/net/minecraft/world/chunk/Chunk.java.patch
View File

@ -204,6 +204,15 @@
this.worldObj.unloadEntities(this.entityLists[i]);
}
MinecraftForge.EVENT_BUS.post(new ChunkEvent.Unload(this));
@@ -1025,7 +1139,7 @@
public Random getRandomWithSeed(long p_76617_1_)
{
- return new Random(this.worldObj.getSeed() + (long)(this.xPosition * this.xPosition * 4987142) + (long)(this.xPosition * 5947611) + (long)(this.zPosition * this.zPosition) * 4392871L + (long)(this.zPosition * 389711) ^ p_76617_1_);
+ return new Random(this.worldObj.getSeed() + (4987142L * this.xPosition * this.xPosition) + (5947611L * this.xPosition) + (4392871L * this.zPosition * this.zPosition) + (389711L * this.zPosition) ^ p_76617_1_);
}
public boolean isEmpty()
@@ -1035,6 +1149,7 @@
public void populateChunk(IChunkProvider p_76624_1_, IChunkProvider p_76624_2_, int p_76624_3_, int p_76624_4_)

11
patches/net/minecraft/world/chunk/EmptyChunk.java.patch Normal file
View File

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/world/chunk/EmptyChunk.java
+++ ../src-work/minecraft/net/minecraft/world/chunk/EmptyChunk.java
@@ -113,7 +113,7 @@
public Random getRandomWithSeed(long p_76617_1_)
{
- return new Random(this.worldObj.getSeed() + (long)(this.xPosition * this.xPosition * 4987142) + (long)(this.xPosition * 5947611) + (long)(this.zPosition * this.zPosition) * 4392871L + (long)(this.zPosition * 389711) ^ p_76617_1_);
+ return new Random(this.worldObj.getSeed() + (4987142L * this.xPosition * this.xPosition) + (5947611L * this.xPosition) + (4392871L * this.zPosition * this.zPosition) + (389711L * this.zPosition) ^ p_76617_1_);
}
public boolean isEmpty()

10
patches/net/minecraft/world/gen/FlatLayerInfo.java.patch Normal file
View File

@ -0,0 +1,10 @@
--- ../src-base/minecraft/net/minecraft/world/gen/FlatLayerInfo.java
+++ ../src-work/minecraft/net/minecraft/world/gen/FlatLayerInfo.java
@@ -12,7 +12,6 @@
public FlatLayerInfo(int p_i45467_1_, Block p_i45467_2_)
{
- this.layerCount = 1;
this.layerCount = p_i45467_1_;
this.field_151537_a = p_i45467_2_;
}

11
patches/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java.patch Normal file
View File

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
+++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
@@ -50,7 +50,7 @@
p_76484_1_.setBlock(i1, j1, k1, Blocks.chest, 0, 2);
TileEntityChest tileentitychest = (TileEntityChest)p_76484_1_.getTileEntity(i1, j1, k1);
- if (tileentitychest != null && tileentitychest != null)
+ if (tileentitychest != null)
{
WeightedRandomChestContent.generateChestContents(p_76484_2_, this.theBonusChestGenerator, tileentitychest, this.itemsToGenerateInBonusChest);
}

3
patches/net/minecraft/world/storage/SaveHandler.java.patch
View File

@ -124,7 +124,7 @@
public IPlayerFileData getSaveHandler()
{
return this;
@@ -323,6 +371,99 @@
@@ -323,6 +371,100 @@
return this.saveDirectoryName;
}
@ -202,6 +202,7 @@
+ {
+ return playersDirectory;
+ }
+
+ // CraftBukkit end
+
+ // Cauldron start