From 418a47976a970fe98b01653717c094fa31717dac Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 30 Oct 2012 09:27:34 -0400 Subject: [PATCH] This update fixes some world corrupting vanilla error handling, mostly caused by mods doing something derpy. Hopefully, your world saves will thank me. Note that if the mod does derp, it's data is lost. It's not FML or Minecraft Forge's responsibility if "DirtChest 2000 Mk5" can't write their TileEntity method correctly and you lose your 100000 diamonds. Update FML: a3a93f3 a3a93f3 Fix some whitespace issues, handle possibly bugged entities as well a7eb5dc Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load. --- ...rc-4.2.8.424.zip => fml-src-4.2.10.426.zip | Bin 875187 -> 878141 bytes .../minecraft/src/AnvilChunkLoader.java.patch | 10 +- .../net/minecraft/src/TileEntity.java.patch | 2 +- .../common/net/minecraft/src/World.java.patch | 110 +++++++++--------- 4 files changed, 61 insertions(+), 61 deletions(-) rename fml-src-4.2.8.424.zip => fml-src-4.2.10.426.zip (95%) diff --git a/fml-src-4.2.8.424.zip b/fml-src-4.2.10.426.zip similarity index 95% rename from fml-src-4.2.8.424.zip rename to fml-src-4.2.10.426.zip index 7939d53ab9bcd20794eecb8b026db804484c6b68..76f473cc84a4aab474c46bb577beb0e9cc6dd24e 100644 GIT binary patch delta 19500 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
  • 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 diff --git a/patches/common/net/minecraft/src/AnvilChunkLoader.java.patch b/patches/common/net/minecraft/src/AnvilChunkLoader.java.patch index 1d1d8d40e6..17f218e65d 100644 --- a/patches/common/net/minecraft/src/AnvilChunkLoader.java.patch +++ b/patches/common/net/minecraft/src/AnvilChunkLoader.java.patch @@ -1,8 +1,8 @@ --- ../src_base/common/net/minecraft/src/AnvilChunkLoader.java +++ ../src_work/common/net/minecraft/src/AnvilChunkLoader.java -@@ -10,6 +10,9 @@ - import java.util.List; - import java.util.Set; +@@ -13,6 +13,9 @@ + + import cpw.mods.fml.common.FMLLog; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.ChunkDataEvent; @@ -10,7 +10,7 @@ public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader { private List chunksToRemove = new ArrayList(); -@@ -94,6 +97,7 @@ +@@ -97,6 +100,7 @@ var5 = this.readChunkFromNBT(par1World, par4NBTTagCompound.getCompoundTag("Level")); } @@ -18,7 +18,7 @@ return var5; } } -@@ -109,6 +113,7 @@ +@@ -112,6 +116,7 @@ var3.setTag("Level", var4); this.writeChunkToNBT(par2Chunk, par1World, var4); this.func_75824_a(par2Chunk.getChunkCoordIntPair(), var3); diff --git a/patches/common/net/minecraft/src/TileEntity.java.patch b/patches/common/net/minecraft/src/TileEntity.java.patch index 439e0fd5f1..839ffbaa88 100644 --- a/patches/common/net/minecraft/src/TileEntity.java.patch +++ b/patches/common/net/minecraft/src/TileEntity.java.patch @@ -1,6 +1,6 @@ --- ../src_base/common/net/minecraft/src/TileEntity.java +++ ../src_work/common/net/minecraft/src/TileEntity.java -@@ -264,4 +264,33 @@ +@@ -276,4 +276,33 @@ addMapping(TileEntityBeacon.class, "Beacon"); addMapping(TileEntitySkull.class, "Skull"); } diff --git a/patches/common/net/minecraft/src/World.java.patch b/patches/common/net/minecraft/src/World.java.patch index 38fcadaff2..83e6890b12 100644 --- a/patches/common/net/minecraft/src/World.java.patch +++ b/patches/common/net/minecraft/src/World.java.patch @@ -1,8 +1,8 @@ --- ../src_base/common/net/minecraft/src/World.java +++ ../src_work/common/net/minecraft/src/World.java -@@ -11,8 +11,30 @@ - import java.util.Random; - import java.util.Set; +@@ -13,8 +13,30 @@ + + import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSetMultimap; + @@ -31,7 +31,7 @@ /** * boolean; if true updates scheduled by scheduleBlockUpdate happen immediately */ -@@ -136,6 +158,11 @@ +@@ -138,6 +160,11 @@ */ public BiomeGenBase getBiomeGenForCoords(int par1, int par2) { @@ -43,7 +43,7 @@ if (this.blockExists(par1, 0, par2)) { Chunk var3 = this.getChunkFromBlockCoords(par1, par2); -@@ -165,7 +192,13 @@ +@@ -167,7 +194,13 @@ this.theProfiler = par5Profiler; this.worldInfo = new WorldInfo(par4WorldSettings, par2Str); this.provider = par3WorldProvider; @@ -58,7 +58,7 @@ VillageCollection var6 = (VillageCollection)this.mapStorage.loadData(VillageCollection.class, "villages"); if (var6 == null) -@@ -179,7 +212,7 @@ +@@ -181,7 +214,7 @@ this.villageCollectionObj.func_82566_a(this); } @@ -67,7 +67,7 @@ this.chunkProvider = this.createChunkProvider(); this.calculateInitialSkylight(); this.calculateInitialWeather(); -@@ -193,7 +226,7 @@ +@@ -195,7 +228,7 @@ this.isRemote = false; this.saveHandler = par1ISaveHandler; this.theProfiler = par5Profiler; @@ -76,7 +76,7 @@ this.worldInfo = par1ISaveHandler.loadWorldInfo(); if (par4WorldProvider != null) -@@ -227,12 +260,20 @@ +@@ -229,12 +262,20 @@ this.worldInfo.setServerInitialized(true); } @@ -99,7 +99,7 @@ } else { -@@ -244,6 +285,19 @@ +@@ -246,6 +287,19 @@ this.calculateInitialWeather(); } @@ -119,7 +119,7 @@ /** * Creates the chunk provider for this world. Called in the constructor. Retrieves provider from worldProvider? */ -@@ -298,7 +352,8 @@ +@@ -300,7 +354,8 @@ */ public boolean isAirBlock(int par1, int par2, int par3) { @@ -129,7 +129,7 @@ } /** -@@ -307,7 +362,8 @@ +@@ -309,7 +364,8 @@ public boolean blockHasTileEntity(int par1, int par2, int par3) { int var4 = this.getBlockId(par1, par2, par3); @@ -139,7 +139,7 @@ } /** -@@ -1029,7 +1085,7 @@ +@@ -1031,7 +1087,7 @@ */ public boolean isDaytime() { @@ -148,7 +148,7 @@ } /** -@@ -1061,7 +1117,7 @@ +@@ -1063,7 +1119,7 @@ int var12 = this.getBlockMetadata(var8, var9, var10); Block var13 = Block.blocksList[var11]; @@ -157,7 +157,7 @@ { MovingObjectPosition var14 = var13.collisionRayTrace(this, var8, var9, var10, par1Vec3, par2Vec3); -@@ -1261,6 +1317,12 @@ +@@ -1263,6 +1319,12 @@ */ public void playSoundAtEntity(Entity par1Entity, String par2Str, float par3, float par4) { @@ -170,7 +170,7 @@ if (par1Entity != null && par2Str != null) { Iterator var5 = this.worldAccesses.iterator(); -@@ -1359,6 +1421,11 @@ +@@ -1361,6 +1423,11 @@ EntityPlayer var5 = (EntityPlayer)par1Entity; this.playerEntities.add(var5); this.updateAllPlayersSleepingFlag(); @@ -182,7 +182,7 @@ } this.getChunkFromChunkCoords(var2, var3).addEntity(par1Entity); -@@ -1610,6 +1677,12 @@ +@@ -1612,6 +1679,12 @@ * Calculates the color for the skybox */ public Vec3 getSkyColor(Entity par1Entity, float par2) @@ -195,7 +195,7 @@ { float var3 = this.getCelestialAngle(par2); float var4 = MathHelper.cos(var3 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1705,6 +1778,12 @@ +@@ -1707,6 +1780,12 @@ @SideOnly(Side.CLIENT) public Vec3 drawClouds(float par1) { @@ -208,7 +208,7 @@ float var2 = this.getCelestialAngle(par1); float var3 = MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1783,7 +1862,7 @@ +@@ -1785,7 +1864,7 @@ { int var5 = var3.getBlockID(par1, var4, par2); @@ -217,7 +217,7 @@ { return var4 + 1; } -@@ -1798,6 +1877,12 @@ +@@ -1800,6 +1879,12 @@ * How bright are stars in the sky */ public float getStarBrightness(float par1) @@ -230,7 +230,7 @@ { float var2 = this.getCelestialAngle(par1); float var3 = 1.0F - (MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.25F); -@@ -1942,7 +2027,7 @@ +@@ -1945,7 +2030,7 @@ if (var8 != null) { @@ -239,7 +239,7 @@ } } } -@@ -1952,6 +2037,10 @@ +@@ -1955,6 +2040,10 @@ if (!this.entityRemoval.isEmpty()) { @@ -250,7 +250,7 @@ this.loadedTileEntityList.removeAll(this.entityRemoval); this.entityRemoval.clear(); } -@@ -1972,7 +2061,9 @@ +@@ -1975,7 +2064,9 @@ { this.loadedTileEntityList.add(var9); } @@ -261,7 +261,7 @@ if (this.chunkExists(var9.xCoord >> 4, var9.zCoord >> 4)) { Chunk var10 = this.getChunkFromChunkCoords(var9.xCoord >> 4, var9.zCoord >> 4); -@@ -1982,8 +2073,6 @@ +@@ -1985,8 +2076,6 @@ var10.setChunkBlockTileEntity(var9.xCoord & 15, var9.yCoord, var9.zCoord & 15, var9); } } @@ -270,7 +270,7 @@ } } -@@ -1996,13 +2085,13 @@ +@@ -1999,13 +2088,13 @@ public void addTileEntity(Collection par1Collection) { @@ -291,7 +291,7 @@ } } -@@ -2022,9 +2111,17 @@ +@@ -2025,9 +2114,17 @@ { int var3 = MathHelper.floor_double(par1Entity.posX); int var4 = MathHelper.floor_double(par1Entity.posZ); @@ -312,7 +312,7 @@ { par1Entity.lastTickPosX = par1Entity.posX; par1Entity.lastTickPosY = par1Entity.posY; -@@ -2259,6 +2356,14 @@ +@@ -2262,6 +2359,14 @@ { return true; } @@ -327,7 +327,7 @@ } } } -@@ -2566,25 +2671,21 @@ +@@ -2569,25 +2674,21 @@ */ public void setBlockTileEntity(int par1, int par2, int par3, TileEntity par4TileEntity) { @@ -368,7 +368,7 @@ } } -@@ -2593,27 +2694,10 @@ +@@ -2596,27 +2697,10 @@ */ public void removeBlockTileEntity(int par1, int par2, int par3) { @@ -400,7 +400,7 @@ } } -@@ -2639,7 +2723,8 @@ +@@ -2642,7 +2726,8 @@ */ public boolean isBlockNormalCube(int par1, int par2, int par3) { @@ -410,7 +410,7 @@ } /** -@@ -2647,8 +2732,7 @@ +@@ -2650,8 +2735,7 @@ */ public boolean doesBlockHaveSolidTopSurface(int par1, int par2, int par3) { @@ -420,7 +420,7 @@ } /** -@@ -2664,7 +2748,7 @@ +@@ -2667,7 +2751,7 @@ if (var5 != null && !var5.isEmpty()) { Block var6 = Block.blocksList[this.getBlockId(par1, par2, par3)]; @@ -429,7 +429,7 @@ } else { -@@ -2695,8 +2779,7 @@ +@@ -2698,8 +2782,7 @@ */ public void setAllowedSpawnTypes(boolean par1, boolean par2) { @@ -439,7 +439,7 @@ } /** -@@ -2712,6 +2795,11 @@ +@@ -2715,6 +2798,11 @@ */ private void calculateInitialWeather() { @@ -451,7 +451,7 @@ if (this.worldInfo.isRaining()) { this.rainingStrength = 1.0F; -@@ -2727,6 +2815,11 @@ +@@ -2730,6 +2818,11 @@ * Updates all weather states. */ protected void updateWeather() @@ -463,7 +463,7 @@ { if (!this.provider.hasNoSky) { -@@ -2829,12 +2922,14 @@ +@@ -2832,12 +2925,14 @@ public void toggleRain() { @@ -479,7 +479,7 @@ this.theProfiler.startSection("buildList"); int var1; EntityPlayer var2; -@@ -2941,6 +3036,11 @@ +@@ -2944,6 +3039,11 @@ */ public boolean canBlockFreeze(int par1, int par2, int par3, boolean par4) { @@ -491,7 +491,7 @@ BiomeGenBase var5 = this.getBiomeGenForCoords(par1, par3); float var6 = var5.getFloatTemperature(); -@@ -2998,6 +3098,11 @@ +@@ -3001,6 +3101,11 @@ * Tests whether or not snow can be placed at a given location */ public boolean canSnowAt(int par1, int par2, int par3) @@ -503,7 +503,7 @@ { BiomeGenBase var4 = this.getBiomeGenForCoords(par1, par3); float var5 = var4.getFloatTemperature(); -@@ -3091,7 +3196,7 @@ +@@ -3094,7 +3199,7 @@ private int computeBlockLightValue(int par1, int par2, int par3, int par4, int par5, int par6) { @@ -512,7 +512,7 @@ int var8 = this.getSavedLightValue(EnumSkyBlock.Block, par2 - 1, par3, par4) - par6; int var9 = this.getSavedLightValue(EnumSkyBlock.Block, par2 + 1, par3, par4) - par6; int var10 = this.getSavedLightValue(EnumSkyBlock.Block, par2, par3 - 1, par4) - par6; -@@ -3226,7 +3331,7 @@ +@@ -3229,7 +3334,7 @@ int var21 = var24 + (var18 / 2 + 1) % 3 / 2 * var19; int var22 = var12 + (var18 / 2 + 2) % 3 / 2 * var19; var14 = this.getSavedLightValue(par1EnumSkyBlock, var20, var21, var22); @@ -521,7 +521,7 @@ if (var23 == 0) { -@@ -3257,7 +3362,7 @@ +@@ -3260,7 +3365,7 @@ var12 = (var9 >> 12 & 63) - 32 + par4; var13 = this.getSavedLightValue(par1EnumSkyBlock, var10, var24, var12); var14 = this.getBlockId(var10, var24, var12); @@ -530,7 +530,7 @@ if (var15 == 0) { -@@ -3359,10 +3464,10 @@ +@@ -3362,10 +3467,10 @@ public List getEntitiesWithinAABBExcludingEntity(Entity par1Entity, AxisAlignedBB par2AxisAlignedBB) { this.entitiesWithinAABBExcludingEntity.clear(); @@ -545,7 +545,7 @@ for (int var7 = var3; var7 <= var4; ++var7) { -@@ -3388,10 +3493,10 @@ +@@ -3391,10 +3496,10 @@ public List func_82733_a(Class par1Class, AxisAlignedBB par2AxisAlignedBB, IEntitySelector par3IEntitySelector) { @@ -560,7 +560,7 @@ ArrayList var8 = new ArrayList(); for (int var9 = var4; var9 <= var5; ++var9) -@@ -3485,11 +3590,14 @@ +@@ -3488,11 +3593,14 @@ */ public void addLoadedEntities(List par1List) { @@ -578,7 +578,7 @@ } } -@@ -3523,6 +3631,11 @@ +@@ -3526,6 +3634,11 @@ else { if (var9 != null && (var9 == Block.waterMoving || var9 == Block.waterStill || var9 == Block.lavaMoving || var9 == Block.lavaStill || var9 == Block.fire || var9.blockMaterial.isGroundCover())) @@ -590,7 +590,7 @@ { var9 = null; } -@@ -3740,7 +3853,7 @@ +@@ -3743,7 +3856,7 @@ */ public long getSeed() { @@ -599,7 +599,7 @@ } public long func_82737_E() -@@ -3750,7 +3863,7 @@ +@@ -3753,7 +3866,7 @@ public long getWorldTime() { @@ -608,7 +608,7 @@ } /** -@@ -3758,7 +3871,7 @@ +@@ -3761,7 +3874,7 @@ */ public void setWorldTime(long par1) { @@ -617,7 +617,7 @@ } /** -@@ -3766,13 +3879,13 @@ +@@ -3769,13 +3882,13 @@ */ public ChunkCoordinates getSpawnPoint() { @@ -633,7 +633,7 @@ } @SideOnly(Side.CLIENT) -@@ -3796,7 +3909,10 @@ +@@ -3799,7 +3912,10 @@ if (!this.loadedEntityList.contains(par1Entity)) { @@ -645,7 +645,7 @@ } } -@@ -3804,6 +3920,11 @@ +@@ -3807,6 +3923,11 @@ * Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. */ public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4) @@ -657,7 +657,7 @@ { return true; } -@@ -3921,8 +4042,7 @@ +@@ -3924,8 +4045,7 @@ */ public boolean isBlockHighHumidity(int par1, int par2, int par3) { @@ -667,7 +667,7 @@ } /** -@@ -3984,7 +4104,7 @@ +@@ -3987,7 +4107,7 @@ */ public int getHeight() { @@ -676,7 +676,7 @@ } /** -@@ -3992,7 +4112,7 @@ +@@ -3995,7 +4115,7 @@ */ public int getActualHeight() { @@ -685,7 +685,7 @@ } public IUpdatePlayerListBox func_82735_a(EntityMinecart par1EntityMinecart) -@@ -4035,7 +4155,7 @@ +@@ -4038,7 +4158,7 @@ */ public double getHorizon() { @@ -694,7 +694,7 @@ } /** -@@ -4074,4 +4194,75 @@ +@@ -4077,4 +4197,75 @@ this.field_83016_L.setTimeInMillis(System.currentTimeMillis()); return this.field_83016_L; }