Browse Source

Normalize patches

master
Prototik 10 years ago
parent
commit
33633471ca
  1. 10
      patches/cpw/mods/fml/common/discovery/ModDiscoverer.java.patch
  2. 4
      patches/cpw/mods/fml/relauncher/CoreModManager.java.patch
  3. 2
      patches/net/minecraft/entity/Entity.java.patch
  4. 2
      patches/net/minecraft/entity/EntityLeashKnot.java.patch
  5. 2
      patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch
  6. 2
      patches/net/minecraft/entity/item/EntityEnderEye.java.patch
  7. 2
      patches/net/minecraft/entity/item/EntityEnderPearl.java.patch
  8. 2
      patches/net/minecraft/entity/item/EntityExpBottle.java.patch
  9. 2
      patches/net/minecraft/entity/item/EntityFallingBlock.java.patch
  10. 2
      patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch
  11. 2
      patches/net/minecraft/entity/item/EntityItemFrame.java.patch
  12. 2
      patches/net/minecraft/entity/item/EntityPainting.java.patch
  13. 2
      patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch
  14. 2
      patches/net/minecraft/entity/item/EntityXPOrb.java.patch
  15. 2
      patches/net/minecraft/entity/projectile/EntityArrow.java.patch
  16. 2
      patches/net/minecraft/entity/projectile/EntityEgg.java.patch
  17. 2
      patches/net/minecraft/entity/projectile/EntityFireball.java.patch
  18. 2
      patches/net/minecraft/entity/projectile/EntityFishHook.java.patch
  19. 2
      patches/net/minecraft/entity/projectile/EntityPotion.java.patch
  20. 2
      patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch
  21. 2
      patches/net/minecraft/entity/projectile/EntitySnowball.java.patch
  22. 2
      patches/net/minecraft/entity/projectile/EntityWitherSkull.java.patch
  23. 4
      patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
  24. 2
      patches/net/minecraft/world/World.java.patch
  25. 10
      patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
  26. 2
      patches/org/bukkit/event/player/PlayerTeleportEvent.java.patch

10
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<ModContainer> 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();
+ }
+ }
+ }
+

4
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")));

2
patches/net/minecraft/entity/Entity.java.patch

@ -791,7 +791,7 @@
+ }
+
+ public boolean entityProjectileHook() {
+ return false;
+ return false;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/EntityLeashKnot.java.patch

@ -92,7 +92,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityEnderCrystal.java.patch

@ -55,7 +55,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityEnderEye.java.patch

@ -17,7 +17,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityEnderPearl.java.patch

@ -62,7 +62,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityExpBottle.java.patch

@ -30,7 +30,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityFallingBlock.java.patch

@ -74,7 +74,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityFireworkRocket.java.patch

@ -17,7 +17,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityItemFrame.java.patch

@ -22,7 +22,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityPainting.java.patch

@ -26,7 +26,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityTNTPrimed.java.patch

@ -63,7 +63,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/item/EntityXPOrb.java.patch

@ -165,7 +165,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntityArrow.java.patch

@ -153,7 +153,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntityEgg.java.patch

@ -81,7 +81,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntityFireball.java.patch

@ -130,7 +130,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntityFishHook.java.patch

@ -122,7 +122,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntityPotion.java.patch

@ -109,7 +109,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntitySmallFireball.java.patch

@ -50,7 +50,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntitySnowball.java.patch

@ -8,7 +8,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

2
patches/net/minecraft/entity/projectile/EntityWitherSkull.java.patch

@ -44,7 +44,7 @@
+ // Cauldron start
+ @Override
+ public boolean entityProjectileHook() {
+ return true;
+ return true;
+ }
+ // Cauldron end
}

4
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()

2
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));

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

@ -139,11 +139,11 @@
- this.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
- }
+ this.loadedChunkHashMap.forEachValue(new TObjectProcedure<Chunk>() {
+ @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;
+ }
+ });
}

2
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;
+ }

Loading…
Cancel
Save