Normalize patches

patches/net/minecraft/world/World.java.patch

@@ -256,7 +256,7 @@
 +            org.bukkit.World.Environment env)
 +    {
 +        this.spigotConfig = new org.spigotmc.SpigotWorldConfig(p_i45369_2_); // Spigot
-+    	initLimiter(); // Spigot
++        initLimiter(); // Spigot
 +        // Cauldron start
 +        this.cauldronConfig = new CauldronWorldConfig(p_i45369_2_, MinecraftServer.getServer().cauldronConfig);
 +        this.tileentityConfig = new TileEntityWorldConfig(p_i45369_2_, MinecraftServer.getServer().tileEntityConfig);
@@ -401,7 +401,7 @@
 +        if (DimensionManager.getWorld(0) != null)
 +        {
 +            this.spigotConfig = new org.spigotmc.SpigotWorldConfig(p_i45369_2_); // Spigot
-+        	initLimiter(); // Spigot
++            initLimiter(); // Spigot
 +            this.cauldronConfig = new CauldronWorldConfig(p_i45369_2_, MinecraftServer.getServer().cauldronConfig);
 +            this.tileentityConfig = new TileEntityWorldConfig(p_i45369_2_, MinecraftServer.getServer().tileEntityConfig);
 +            this.world = DimensionManager.getWorld(0).getWorld();
@@ -627,7 +627,7 @@
 +
 +    public boolean addEntity(Entity p_72838_1_, SpawnReason spawnReason) // Changed signature, added SpawnReason
 +    {
-+    	if (!p_72838_1_.entityAllowedToSpawn()) return false; // Cauldron
++        if (!p_72838_1_.entityAllowedToSpawn()) return false; // Cauldron
          // do not drop any items while restoring blocksnapshots. Prevents dupes
          if (!this.isRemote && (p_72838_1_ == null || (p_72838_1_ instanceof net.minecraft.entity.item.EntityItem && this.restoringBlockSnapshots))) return false;
  
@@ -875,7 +875,7 @@
 +        int entitiesThisCycle = 0;
 +        if (tickPosition < 0) tickPosition = 0;
 +        for (entityLimiter.initTick(); entitiesThisCycle < loadedEntityList.size() && (entitiesThisCycle % 10 == 0 || entityLimiter.shouldContinue()); tickPosition++, entitiesThisCycle++) { 
-+        	tickPosition = (tickPosition < loadedEntityList.size()) ? tickPosition : 0;
++            tickPosition = (tickPosition < loadedEntityList.size()) ? tickPosition : 0;
 +            entity = (Entity)this.loadedEntityList.get(this.tickPosition);
  
              if (entity.ridingEntity != null)
@@ -925,9 +925,9 @@
 -            if (!tileentity.isInvalid() && tileentity.hasWorldObj() && this.blockExists(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord))
 +        int tilesThisCycle = 0;
 +        for (tileLimiter.initTick(); tilesThisCycle < loadedTileEntityList.size() && (tilesThisCycle % 10 == 0 || tileLimiter.shouldContinue()); tileTickPosition++, tilesThisCycle++) {
-+        	tileTickPosition = (tileTickPosition < loadedTileEntityList.size()) ? tileTickPosition : 0;
-+        	TileEntity tileentity = (TileEntity) this.loadedTileEntityList.get(tileTickPosition);
-+        	
++            tileTickPosition = (tileTickPosition < loadedTileEntityList.size()) ? tileTickPosition : 0;
++            TileEntity tileentity = (TileEntity) this.loadedTileEntityList.get(tileTickPosition);
++            
 +            // Spigot start
 +            if (tileentity == null)
              {
@@ -1365,14 +1365,14 @@
 +    
 +    // Spigot start
 +    private void initLimiter() {
-+    	entityLimiter = new TickLimiter(spigotConfig.entityMaxTickTime);
-+    	tileLimiter = new TickLimiter(spigotConfig.tileMaxTickTime);
++        entityLimiter = new TickLimiter(spigotConfig.entityMaxTickTime);
++        tileLimiter = new TickLimiter(spigotConfig.tileMaxTickTime);
 +    }
 +    // Spigot end
 +    
 +    // Cauldron start
 +    public boolean isProfilingWorld() {
-+    	return provider.dimensionId == Integer.MIN_VALUE; // Mystcraft
++        return provider.dimensionId == Integer.MIN_VALUE; // Mystcraft
 +    }
 +    // Cauldron end
  }

patches/net/minecraft/world/gen/ChunkProviderServer.java.patch

@@ -100,7 +100,7 @@
      public void unloadAllChunks()
      {
 -        Iterator iterator = this.loadedChunks.iterator();
-+    	mUnloading = true;
++        mUnloading = true;
 +        Iterator iterator = this.loadedChunkHashMap.values().iterator(); // CraftBukkit
  
          while (iterator.hasNext())
@@ -119,7 +119,7 @@
 -        long k = ChunkCoordIntPair.chunkXZ2Int(par1, par2);
 -        this.chunksToUnload.remove(Long.valueOf(k));
 -        Chunk chunk = (Chunk)this.loadedChunkHashMap.getValueByKey(k);
-+    	if (mUnloading) return null;
++        if (mUnloading) return null;
 +        this.chunksToUnload.remove(par1, par2);
 +        Chunk chunk = (Chunk) this.loadedChunkHashMap.get(LongHash.toLong(par1, par2));
 +        boolean newChunk = false;
@@ -142,7 +142,7 @@
 -        long k = ChunkCoordIntPair.chunkXZ2Int(p_73158_1_, p_73158_2_);
 -        this.chunksToUnload.remove(Long.valueOf(k));
 -        Chunk chunk = (Chunk)this.loadedChunkHashMap.getValueByKey(k);
-+    	if (mUnloading) return null;
++        if (mUnloading) return null;
 +        this.chunksToUnload.remove(p_73158_1_, p_73158_2_);
 +        Chunk chunk = (Chunk) this.loadedChunkHashMap.get(LongHash.toLong(p_73158_1_, p_73158_2_));
 +        boolean newChunk = false; // CraftBukkit
@@ -213,7 +213,7 @@
      {
 -        Chunk chunk = (Chunk)this.loadedChunkHashMap.getValueByKey(ChunkCoordIntPair.chunkXZ2Int(p_73154_1_, p_73154_2_));
 -        return chunk == null ? (!this.worldObj.findingSpawnPoint && !this.loadChunkOnProvideRequest ? this.defaultEmptyChunk : this.loadChunk(p_73154_1_, p_73154_2_)) : chunk;
-+    	if (mUnloading) return null;
++        if (mUnloading) return null;
 +        // CraftBukkit start
 +        Chunk chunk = (Chunk) this.loadedChunkHashMap.get(LongHash.toLong(p_73154_1_, p_73154_2_));
 +        chunk = chunk == null ? (shouldLoadChunk() ? this.loadChunk(p_73154_1_, p_73154_2_) : this.defaultEmptyChunk) : chunk; // Cauldron handle forge server tick events and load the chunk within 5 seconds of the world being loaded (for chunk loaders)

patches/net/minecraft/world/storage/DerivedWorldInfo.java.patch

@@ -5,7 +5,7 @@
      public String getWorldName()
      {
 -        return this.theWorldInfo.getWorldName();
-+    	String name = super.getWorldName();
++        String name = super.getWorldName();
 +        return name != null ? name : this.theWorldInfo.getWorldName();
      }
  
@@ -25,15 +25,15 @@
      }
 +    
 +    public int getDimension() {
-+    	return this.theWorldInfo.getDimension();
++        return this.theWorldInfo.getDimension();
 +    }
 +    
 +    public void setDimension(int dim) {
-+    	this.theWorldInfo.setDimension(dim);
++        this.theWorldInfo.setDimension(dim);
 +    }
 +    
 +    @Override
 +    public void tick() {
-+    	theWorldInfo.tick();
++        theWorldInfo.tick();
 +    }
  }

patches/net/minecraft/world/storage/WorldInfo.java.patch

@@ -52,6 +52,6 @@
      }
 +    
 +    public void tick() {
-+    	totalTime++;
++        totalTime++;
 +    }
  }