diff --git a/patches/cpw/mods/fml/common/discovery/ModDiscoverer.java.patch b/patches/cpw/mods/fml/common/discovery/ModDiscoverer.java.patch index 8526e79..646626d 100644 --- a/patches/cpw/mods/fml/common/discovery/ModDiscoverer.java.patch +++ b/patches/cpw/mods/fml/common/discovery/ModDiscoverer.java.patch @@ -17,11 +17,11 @@ + if (!"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) { + java.util.Iterator iterator = modList.iterator(); + while(iterator.hasNext()) { -+ ModContainer container = iterator.next(); -+ if ("FastCraft".equals(container.getModId())) { -+ FMLLog.log(Level.WARN, "Found FastCraft mod, removing it..."); -+ iterator.remove(); -+ } ++ ModContainer container = iterator.next(); ++ if ("FastCraft".equals(container.getModId())) { ++ FMLLog.log(Level.WARN, "Found FastCraft mod, removing it..."); ++ iterator.remove(); ++ } + } + } + diff --git a/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch b/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch index 292ddcd..eb14e88 100644 --- a/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch +++ b/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch @@ -75,8 +75,8 @@ if (cascadedTweaker != null) { + if ("fastcraft.Tweaker".equals(cascadedTweaker) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) { -+ FMLRelaunchLog.info("Found FastCraft tweaker, skipping..."); -+ continue; ++ FMLRelaunchLog.info("Found FastCraft tweaker, skipping..."); ++ continue; + } FMLRelaunchLog.info("Loading tweaker %s from %s", cascadedTweaker, coreMod.getName()); Integer sortOrder = Ints.tryParse(Strings.nullToEmpty(mfAttributes.getValue("TweakOrder"))); diff --git a/patches/net/minecraft/entity/Entity.java.patch b/patches/net/minecraft/entity/Entity.java.patch index 4ae4c2d..113c3ed 100644 --- a/patches/net/minecraft/entity/Entity.java.patch +++ b/patches/net/minecraft/entity/Entity.java.patch @@ -791,7 +791,7 @@ + } + + public boolean entityProjectileHook() { -+ return false; ++ return false; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/EntityLeashKnot.java.patch b/patches/net/minecraft/entity/EntityLeashKnot.java.patch index 47c56ab..fa38457 100644 --- a/patches/net/minecraft/entity/EntityLeashKnot.java.patch +++ b/patches/net/minecraft/entity/EntityLeashKnot.java.patch @@ -92,7 +92,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch b/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch index d377800..c718a87 100644 --- a/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch +++ b/patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch @@ -55,7 +55,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityEnderEye.java.patch b/patches/net/minecraft/entity/item/EntityEnderEye.java.patch index 691a2d2..c7c6882 100644 --- a/patches/net/minecraft/entity/item/EntityEnderEye.java.patch +++ b/patches/net/minecraft/entity/item/EntityEnderEye.java.patch @@ -17,7 +17,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch b/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch index 903c1b0..050c171 100644 --- a/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch +++ b/patches/net/minecraft/entity/item/EntityEnderPearl.java.patch @@ -62,7 +62,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityExpBottle.java.patch b/patches/net/minecraft/entity/item/EntityExpBottle.java.patch index 8fda862..0b1da5e 100644 --- a/patches/net/minecraft/entity/item/EntityExpBottle.java.patch +++ b/patches/net/minecraft/entity/item/EntityExpBottle.java.patch @@ -30,7 +30,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch b/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch index ef55041..0fbecc5 100644 --- a/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch +++ b/patches/net/minecraft/entity/item/EntityFallingBlock.java.patch @@ -74,7 +74,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch b/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch index 5e51be3..a452dc5 100644 --- a/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch +++ b/patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch @@ -17,7 +17,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityItemFrame.java.patch b/patches/net/minecraft/entity/item/EntityItemFrame.java.patch index 737dd9d..2edbf57 100644 --- a/patches/net/minecraft/entity/item/EntityItemFrame.java.patch +++ b/patches/net/minecraft/entity/item/EntityItemFrame.java.patch @@ -22,7 +22,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityPainting.java.patch b/patches/net/minecraft/entity/item/EntityPainting.java.patch index 81ee2f4..4c39924 100644 --- a/patches/net/minecraft/entity/item/EntityPainting.java.patch +++ b/patches/net/minecraft/entity/item/EntityPainting.java.patch @@ -26,7 +26,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch b/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch index 0fb097e..fb2f909 100644 --- a/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch +++ b/patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch @@ -63,7 +63,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/item/EntityXPOrb.java.patch b/patches/net/minecraft/entity/item/EntityXPOrb.java.patch index f967fda..0600598 100644 --- a/patches/net/minecraft/entity/item/EntityXPOrb.java.patch +++ b/patches/net/minecraft/entity/item/EntityXPOrb.java.patch @@ -165,7 +165,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntityArrow.java.patch b/patches/net/minecraft/entity/projectile/EntityArrow.java.patch index 400e350..d360d7e 100644 --- a/patches/net/minecraft/entity/projectile/EntityArrow.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityArrow.java.patch @@ -153,7 +153,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntityEgg.java.patch b/patches/net/minecraft/entity/projectile/EntityEgg.java.patch index 97b3914..d0739e7 100644 --- a/patches/net/minecraft/entity/projectile/EntityEgg.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityEgg.java.patch @@ -81,7 +81,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntityFireball.java.patch b/patches/net/minecraft/entity/projectile/EntityFireball.java.patch index d75f8d8..69d48aa 100644 --- a/patches/net/minecraft/entity/projectile/EntityFireball.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityFireball.java.patch @@ -130,7 +130,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch b/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch index 18e037f..d28a2a4 100644 --- a/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityFishHook.java.patch @@ -122,7 +122,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntityPotion.java.patch b/patches/net/minecraft/entity/projectile/EntityPotion.java.patch index d78bb67..25f0c66 100644 --- a/patches/net/minecraft/entity/projectile/EntityPotion.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityPotion.java.patch @@ -109,7 +109,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch b/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch index f9d1362..3980c66 100644 --- a/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch +++ b/patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch @@ -50,7 +50,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntitySnowball.java.patch b/patches/net/minecraft/entity/projectile/EntitySnowball.java.patch index ba525aa..61215e4 100644 --- a/patches/net/minecraft/entity/projectile/EntitySnowball.java.patch +++ b/patches/net/minecraft/entity/projectile/EntitySnowball.java.patch @@ -8,7 +8,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/entity/projectile/EntityWitherSkull.java.patch b/patches/net/minecraft/entity/projectile/EntityWitherSkull.java.patch index ca4f951..a324d39 100644 --- a/patches/net/minecraft/entity/projectile/EntityWitherSkull.java.patch +++ b/patches/net/minecraft/entity/projectile/EntityWitherSkull.java.patch @@ -44,7 +44,7 @@ + // Cauldron start + @Override + public boolean entityProjectileHook() { -+ return true; ++ return true; + } + // Cauldron end } diff --git a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch index 9687079..74fd628 100644 --- a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -912,8 +912,8 @@ } + public int getMaxVisiblePlayers() { -+ int max = mcServer.cauldronConfig.maxPlayersVisible.getValue(); -+ return max > 0 ? max : maxPlayers; ++ int max = mcServer.cauldronConfig.maxPlayersVisible.getValue(); ++ return max > 0 ? max : maxPlayers; + } + public String[] getAvailablePlayerDat() diff --git a/patches/net/minecraft/world/World.java.patch b/patches/net/minecraft/world/World.java.patch index 8af29e9..6f98ec1 100644 --- a/patches/net/minecraft/world/World.java.patch +++ b/patches/net/minecraft/world/World.java.patch @@ -1037,7 +1037,7 @@ public void updateEntityWithOptionalForce(Entity p_72866_1_, boolean p_72866_2_) { -+ if (p_72866_1_.isDead) return; ++ if (p_72866_1_.isDead) return; int i = MathHelper.floor_double(p_72866_1_.posX); int j = MathHelper.floor_double(p_72866_1_.posZ); boolean isForced = getPersistentChunks().containsKey(new ChunkCoordIntPair(i >> 4, j >> 4)); diff --git a/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch b/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch index 4f7a7f9..e38629d 100644 --- a/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch +++ b/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch @@ -139,11 +139,11 @@ - this.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition); - } + this.loadedChunkHashMap.forEachValue(new TObjectProcedure() { -+ @Override -+ public boolean execute(Chunk chunk) { -+ unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition); -+ return true; -+ } ++ @Override ++ public boolean execute(Chunk chunk) { ++ unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition); ++ return true; ++ } + }); } diff --git a/patches/org/bukkit/event/player/PlayerTeleportEvent.java.patch b/patches/org/bukkit/event/player/PlayerTeleportEvent.java.patch index e0436c4..68dc6d0 100644 --- a/patches/org/bukkit/event/player/PlayerTeleportEvent.java.patch +++ b/patches/org/bukkit/event/player/PlayerTeleportEvent.java.patch @@ -21,7 +21,7 @@ + switch(this) { + case NETHER_PORTAL: + case END_PORTAL: -+ return true; ++ return true; + } + return false; + }