From 74c275f71c43d8ab901e3ef6085c505501af3612 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 24 Apr 2014 16:27:12 +1000 Subject: [PATCH] Upstream merge --- Bukkit | 2 +- CraftBukkit | 2 +- CraftBukkit-Patches/0002-mc-dev-imports.patch | 291 +++++++++++++++++- .../0003-Skeleton-API-Implementations.patch | 6 +- .../0005-Spigot-Configuration.patch | 8 +- .../0006-Better-Chunk-Tick-Selection.patch | 25 +- .../0007-Crop-Growth-Rates.patch | 16 +- .../0009-Merge-tweaks-and-configuration.patch | 6 +- .../0011-Async-Operation-Catching.patch | 18 +- CraftBukkit-Patches/0012-View-Distance.patch | 8 +- .../0014-Improved-Timings-System.patch | 34 +- ...b-Spawning-Relative-to-View-Distance.patch | 8 +- .../0016-Handle-Null-Tile-Entities.patch | 6 +- .../0017-Entity-Activation-Range.patch | 8 +- .../0019-PlayerItemDamageEvent.patch | 10 +- .../0031-Implement-SpawnerSpawnEvent.patch | 6 +- ...Disabling-of-Random-Lighting-Updates.patch | 10 +- .../0037-Properly-Close-Inventories.patch | 8 +- .../0042-Entity-ticking-chunk-caching.patch | 12 +- ...-chunks-not-being-sent-to-the-client.patch | 6 +- CraftBukkit-Patches/0063-Orebfuscator.patch | 6 +- CraftBukkit-Patches/0071-Particle-API.patch | 8 +- .../0074-More-Efficient-GetCubes.patch | 6 +- .../0081-Fix-ItemStack-Unbreakable-Code.patch | 6 +- ...ck-data-values-that-crash-the-client.patch | 6 +- ... => 0089-Highly-Optimized-Tick-Loop.patch} | 2 +- ...inks.patch => 0090-Add-Spigot-Links.patch} | 2 +- ... 0091-Configurable-Ping-Sample-Size.patch} | 2 +- ...=> 0092-Add-Optional-Tick-Shuffling.patch} | 2 +- ...Allow-Configuring-Chunks-per-Packet.patch} | 2 +- ...Implement-Locale-Getter-for-Players.patch} | 2 +- ...patch => 0095-Cap-Entity-Collisions.patch} | 2 +- ...ne-meal-not-having-the-correct-data.patch} | 2 +- ...atch => 0097-Spam-Filter-Exclusions.patch} | 2 +- ...ion-to-Silence-CommandBlock-Console.patch} | 2 +- ...support-for-fetching-hidden-players.patch} | 2 +- ...llow-Disabling-Creative-Item-Filter.patch} | 2 +- ...h => 0101-Cap-Channel-Registrations.patch} | 2 +- ...mands-to-be-the-main-version-of-a-c.patch} | 2 +- ...the-isDisconnected-method-by-bukkit.patch} | 2 +- ...Implement-Silenceable-Lightning-API.patch} | 6 +- ...paces-on-when-reading-a-chat-packet.patch} | 2 +- ...missibleBase-for-all-Command-Blocks.patch} | 2 +- ...Prevent-hoppers-from-loading-chunks.patch} | 4 +- ...ist.patch => 0108-Guard-Entity-List.patch} | 12 +- ...ificationException-while-being-idle.patch} | 6 +- ...ncellable-WitherSkull-potion-effect.patch} | 2 +- ...iptive-kick-reasons-instead-of-Nope.patch} | 2 +- ...y-prefixed-commands-or-commands-tha.patch} | 2 +- ...names-to-prevent-client-disconnects.patch} | 2 +- ...> 0114-Enable-Improved-Ping-Sending.patch} | 2 +- ...ragon-death-and-wither-spawn-sounds.patch} | 2 +- ...getting-ticked-after-being-queued-f.patch} | 8 +- ...-client-crashes-server-lists-and-Mo.patch} | 2 +- ...tch => 0118-Old-New-Version-Support.patch} | 2 +- ...=> 0119-Treat-Bungee-as-Online-Mode.patch} | 2 +- ...x-several-occurances-of-missed-diff.patch} | 2 +- ...nt-not-properly-cancelling.-Fixes-B.patch} | 2 +- ...arning.patch => 0122-Update-Warning.patch} | 2 +- ...atch => 0123-Add-Conversion-Message.patch} | 2 +- ...el-fishing-event.-Fixes-BUKKIT-5396.patch} | 2 +- ...25-Print-Stack-on-InternalException.patch} | 2 +- ...ffline-Player-Data-Once-if-Required.patch} | 2 +- ...se-for-Non-Existent-Offline-Players.patch} | 2 +- ...Check-for-blank-OfflinePlayer-Names.patch} | 2 +- ...ng.patch => 0129-Fix-Player-Banning.patch} | 2 +- ....patch => 0130-Fix-ban-expire-dates.patch} | 2 +- ...atch => 0131-Correct-Ban-Expiration.patch} | 2 +- ...> 0132-Convert-Horses-owner-to-UUID.patch} | 2 +- ...team-API-to-allow-arbitrary-strings.patch} | 2 +- ... => 0134-Add-Score.isScoreSet-Z-API.patch} | 2 +- ...h => 0135-Log-null-TileEntity-Owner.patch} | 2 +- ...al-case-invalid-usernames-for-UUIDs.patch} | 2 +- ...=> 0137-Convert-player-skulls-async.patch} | 2 +- ...sDefError-crash-and-notify-on-crash.patch} | 8 +- ....patch => 0139-Check-Skull-canPlace.patch} | 16 +- ...0-Don-t-let-trees-replace-any-block.patch} | 8 +- ...-destroying-all-items-in-the-second-.patch | 23 -- 78 files changed, 483 insertions(+), 218 deletions(-) rename CraftBukkit-Patches/{0090-Highly-Optimized-Tick-Loop.patch => 0089-Highly-Optimized-Tick-Loop.patch} (99%) rename CraftBukkit-Patches/{0091-Add-Spigot-Links.patch => 0090-Add-Spigot-Links.patch} (98%) rename CraftBukkit-Patches/{0092-Configurable-Ping-Sample-Size.patch => 0091-Configurable-Ping-Sample-Size.patch} (96%) rename CraftBukkit-Patches/{0093-Add-Optional-Tick-Shuffling.patch => 0092-Add-Optional-Tick-Shuffling.patch} (96%) rename CraftBukkit-Patches/{0094-Allow-Configuring-Chunks-per-Packet.patch => 0093-Allow-Configuring-Chunks-per-Packet.patch} (96%) rename CraftBukkit-Patches/{0095-Implement-Locale-Getter-for-Players.patch => 0094-Implement-Locale-Getter-for-Players.patch} (95%) rename CraftBukkit-Patches/{0096-Cap-Entity-Collisions.patch => 0095-Cap-Entity-Collisions.patch} (97%) rename CraftBukkit-Patches/{0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch => 0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch} (94%) rename CraftBukkit-Patches/{0098-Spam-Filter-Exclusions.patch => 0097-Spam-Filter-Exclusions.patch} (97%) rename CraftBukkit-Patches/{0099-Add-Option-to-Silence-CommandBlock-Console.patch => 0098-Add-Option-to-Silence-CommandBlock-Console.patch} (95%) rename CraftBukkit-Patches/{0100-Add-support-for-fetching-hidden-players.patch => 0099-Add-support-for-fetching-hidden-players.patch} (93%) rename CraftBukkit-Patches/{0101-Allow-Disabling-Creative-Item-Filter.patch => 0100-Allow-Disabling-Creative-Item-Filter.patch} (96%) rename CraftBukkit-Patches/{0102-Cap-Channel-Registrations.patch => 0101-Cap-Channel-Registrations.patch} (92%) rename CraftBukkit-Patches/{0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch => 0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch} (99%) rename CraftBukkit-Patches/{0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch => 0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch} (93%) rename CraftBukkit-Patches/{0105-Implement-Silenceable-Lightning-API.patch => 0104-Implement-Silenceable-Lightning-API.patch} (95%) rename CraftBukkit-Patches/{0106-Normalize-spaces-on-when-reading-a-chat-packet.patch => 0105-Normalize-spaces-on-when-reading-a-chat-packet.patch} (96%) rename CraftBukkit-Patches/{0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch => 0106-Use-one-PermissibleBase-for-all-Command-Blocks.patch} (94%) rename CraftBukkit-Patches/{0108-Prevent-hoppers-from-loading-chunks.patch => 0107-Prevent-hoppers-from-loading-chunks.patch} (89%) rename CraftBukkit-Patches/{0109-Guard-Entity-List.patch => 0108-Guard-Entity-List.patch} (87%) rename CraftBukkit-Patches/{0110-Fix-ConcurrentModificationException-while-being-idle.patch => 0109-Fix-ConcurrentModificationException-while-being-idle.patch} (91%) rename CraftBukkit-Patches/{0111-Cancellable-WitherSkull-potion-effect.patch => 0110-Cancellable-WitherSkull-potion-effect.patch} (96%) rename CraftBukkit-Patches/{0112-Descriptive-kick-reasons-instead-of-Nope.patch => 0111-Descriptive-kick-reasons-instead-of-Nope.patch} (97%) rename CraftBukkit-Patches/{0113-Check-for-manually-prefixed-commands-or-commands-tha.patch => 0112-Check-for-manually-prefixed-commands-or-commands-tha.patch} (95%) rename CraftBukkit-Patches/{0114-Cap-window-names-to-prevent-client-disconnects.patch => 0113-Cap-window-names-to-prevent-client-disconnects.patch} (93%) rename CraftBukkit-Patches/{0115-Enable-Improved-Ping-Sending.patch => 0114-Enable-Improved-Ping-Sending.patch} (97%) rename CraftBukkit-Patches/{0116-Configurable-dragon-death-and-wither-spawn-sounds.patch => 0115-Configurable-dragon-death-and-wither-spawn-sounds.patch} (98%) rename CraftBukkit-Patches/{0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch => 0116-Fix-TileEntities-getting-ticked-after-being-queued-f.patch} (84%) rename CraftBukkit-Patches/{0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch => 0117-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch} (92%) rename CraftBukkit-Patches/{0119-Old-New-Version-Support.patch => 0118-Old-New-Version-Support.patch} (99%) rename CraftBukkit-Patches/{0120-Treat-Bungee-as-Online-Mode.patch => 0119-Treat-Bungee-as-Online-Mode.patch} (94%) rename CraftBukkit-Patches/{0121-Fix-several-occurances-of-missed-diff.patch => 0120-Fix-several-occurances-of-missed-diff.patch} (98%) rename CraftBukkit-Patches/{0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch => 0121-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch} (97%) rename CraftBukkit-Patches/{0123-Update-Warning.patch => 0122-Update-Warning.patch} (97%) rename CraftBukkit-Patches/{0124-Add-Conversion-Message.patch => 0123-Add-Conversion-Message.patch} (91%) rename CraftBukkit-Patches/{0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch => 0124-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch} (94%) rename CraftBukkit-Patches/{0126-Print-Stack-on-InternalException.patch => 0125-Print-Stack-on-InternalException.patch} (91%) rename CraftBukkit-Patches/{0127-Use-Offline-Player-Data-Once-if-Required.patch => 0126-Use-Offline-Player-Data-Once-if-Required.patch} (96%) rename CraftBukkit-Patches/{0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch => 0127-Use-Provided-Case-for-Non-Existent-Offline-Players.patch} (92%) rename CraftBukkit-Patches/{0129-Check-for-blank-OfflinePlayer-Names.patch => 0128-Check-for-blank-OfflinePlayer-Names.patch} (93%) rename CraftBukkit-Patches/{0130-Fix-Player-Banning.patch => 0129-Fix-Player-Banning.patch} (96%) rename CraftBukkit-Patches/{0132-Fix-ban-expire-dates.patch => 0130-Fix-ban-expire-dates.patch} (92%) rename CraftBukkit-Patches/{0133-Correct-Ban-Expiration.patch => 0131-Correct-Ban-Expiration.patch} (93%) rename CraftBukkit-Patches/{0134-Convert-Horses-owner-to-UUID.patch => 0132-Convert-Horses-owner-to-UUID.patch} (94%) rename CraftBukkit-Patches/{0135-Expand-team-API-to-allow-arbitrary-strings.patch => 0133-Expand-team-API-to-allow-arbitrary-strings.patch} (98%) rename CraftBukkit-Patches/{0136-Add-Score.isScoreSet-Z-API.patch => 0134-Add-Score.isScoreSet-Z-API.patch} (96%) rename CraftBukkit-Patches/{0137-Log-null-TileEntity-Owner.patch => 0135-Log-null-TileEntity-Owner.patch} (94%) rename CraftBukkit-Patches/{0138-Don-t-special-case-invalid-usernames-for-UUIDs.patch => 0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch} (96%) rename CraftBukkit-Patches/{0139-Convert-player-skulls-async.patch => 0137-Convert-player-skulls-async.patch} (98%) rename CraftBukkit-Patches/{0140-Prevent-NoClassDefError-crash-and-notify-on-crash.patch => 0138-Prevent-NoClassDefError-crash-and-notify-on-crash.patch} (91%) rename CraftBukkit-Patches/{0131-Check-Skull-canPlace.patch => 0139-Check-Skull-canPlace.patch} (55%) rename CraftBukkit-Patches/{0089-Don-t-let-trees-replace-any-block-when-growing.patch => 0140-Don-t-let-trees-replace-any-block.patch} (80%) delete mode 100644 CraftBukkit-Patches/0141-Stop-anvils-from-destroying-all-items-in-the-second-.patch diff --git a/Bukkit b/Bukkit index f7163d78a6..41d9f93da7 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit f7163d78a692ee42099d133fb8ed2809e882532a +Subproject commit 41d9f93da702dd486e731bad6c08a752ba0c5a89 diff --git a/CraftBukkit b/CraftBukkit index 3779cffb24..6efeddfe57 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 3779cffb24256c4f3370646bb8a44da3fa3affae +Subproject commit 6efeddfe5779931ac3b272010022a41a1c39f1d6 diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index b573897855..97b180cd75 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From 401298e7004254ee150ea7bcd6263eaf68cd6fc1 Mon Sep 17 00:00:00 2001 +From c622cf3a0fddf3113bcf8bf27d99339fff13e400 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports @@ -1328,6 +1328,123 @@ index 0000000..33cfdb2 + } + } +} +diff --git a/src/main/java/net/minecraft/server/ItemSkull.java b/src/main/java/net/minecraft/server/ItemSkull.java +new file mode 100644 +index 0000000..f20c69e +--- /dev/null ++++ b/src/main/java/net/minecraft/server/ItemSkull.java +@@ -0,0 +1,111 @@ ++package net.minecraft.server; ++ ++import java.util.UUID; ++ ++import net.minecraft.util.com.mojang.authlib.GameProfile; ++ ++public class ItemSkull extends Item { ++ ++ private static final String[] b = new String[] { "skeleton", "wither", "zombie", "char", "creeper"}; ++ public static final String[] a = new String[] { "skeleton", "wither", "zombie", "steve", "creeper"}; ++ ++ public ItemSkull() { ++ this.a(CreativeModeTab.c); ++ this.setMaxDurability(0); ++ this.a(true); ++ } ++ ++ public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) { ++ if (l == 0) { ++ return false; ++ } else if (!world.getType(i, j, k).getMaterial().isBuildable()) { ++ return false; ++ } else { ++ if (l == 1) { ++ ++j; ++ } ++ ++ if (l == 2) { ++ --k; ++ } ++ ++ if (l == 3) { ++ ++k; ++ } ++ ++ if (l == 4) { ++ --i; ++ } ++ ++ if (l == 5) { ++ ++i; ++ } ++ ++ if (!world.isStatic) { ++ world.setTypeAndData(i, j, k, Blocks.SKULL, l, 2); ++ int i1 = 0; ++ ++ if (l == 1) { ++ i1 = MathHelper.floor((double) (entityhuman.yaw * 16.0F / 360.0F) + 0.5D) & 15; ++ } ++ ++ TileEntity tileentity = world.getTileEntity(i, j, k); ++ ++ if (tileentity != null && tileentity instanceof TileEntitySkull) { ++ if (itemstack.getData() == 3) { ++ GameProfile gameprofile = null; ++ ++ if (itemstack.hasTag()) { ++ NBTTagCompound nbttagcompound = itemstack.getTag(); ++ ++ if (nbttagcompound.hasKeyOfType("SkullOwner", 10)) { ++ gameprofile = GameProfileSerializer.a(nbttagcompound.getCompound("SkullOwner")); ++ } else if (nbttagcompound.hasKeyOfType("SkullOwner", 8) && nbttagcompound.getString("SkullOwner").length() > 0) { ++ gameprofile = new GameProfile((UUID) null, nbttagcompound.getString("SkullOwner")); ++ } ++ } ++ ++ ((TileEntitySkull) tileentity).setGameProfile(gameprofile); ++ } else { ++ ((TileEntitySkull) tileentity).setSkullType(itemstack.getData()); ++ } ++ ++ ((TileEntitySkull) tileentity).setRotation(i1); ++ ((BlockSkull) Blocks.SKULL).a(world, i, j, k, (TileEntitySkull) tileentity); ++ } ++ ++ --itemstack.count; ++ } ++ ++ return true; ++ } ++ } ++ ++ public int filterData(int i) { ++ return i; ++ } ++ ++ public String a(ItemStack itemstack) { ++ int i = itemstack.getData(); ++ ++ if (i < 0 || i >= b.length) { ++ i = 0; ++ } ++ ++ return super.getName() + "." + b[i]; ++ } ++ ++ public String n(ItemStack itemstack) { ++ if (itemstack.getData() == 3 && itemstack.hasTag()) { ++ if (itemstack.getTag().hasKeyOfType("SkullOwner", 10)) { ++ return LocaleI18n.get("item.skull.player.name", new Object[] { GameProfileSerializer.a(itemstack.getTag().getCompound("SkullOwner")).getName()}); ++ } ++ ++ if (itemstack.getTag().hasKeyOfType("SkullOwner", 8)) { ++ return LocaleI18n.get("item.skull.player.name", new Object[] { itemstack.getTag().getString("SkullOwner")}); ++ } ++ } ++ ++ return super.n(itemstack); ++ } ++} diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java new file mode 100644 index 0000000..02206f5 @@ -3103,6 +3220,178 @@ index 0000000..678aa91 + return watchableobject.d = flag; + } +} +diff --git a/src/main/java/net/minecraft/server/WorldGenForestTree.java b/src/main/java/net/minecraft/server/WorldGenForestTree.java +new file mode 100644 +index 0000000..63c5af6 +--- /dev/null ++++ b/src/main/java/net/minecraft/server/WorldGenForestTree.java +@@ -0,0 +1,166 @@ ++package net.minecraft.server; ++ ++import java.util.Random; ++ ++public class WorldGenForestTree extends WorldGenTreeAbstract { ++ ++ public WorldGenForestTree(boolean flag) { ++ super(flag); ++ } ++ ++ public boolean a(World world, Random random, int i, int j, int k) { ++ int l = random.nextInt(3) + random.nextInt(2) + 6; ++ boolean flag = true; ++ ++ if (j >= 1 && j + l + 1 <= 256) { ++ int i1; ++ int j1; ++ ++ for (int k1 = j; k1 <= j + 1 + l; ++k1) { ++ byte b0 = 1; ++ ++ if (k1 == j) { ++ b0 = 0; ++ } ++ ++ if (k1 >= j + 1 + l - 2) { ++ b0 = 2; ++ } ++ ++ for (i1 = i - b0; i1 <= i + b0 && flag; ++i1) { ++ for (j1 = k - b0; j1 <= k + b0 && flag; ++j1) { ++ if (k1 >= 0 && k1 < 256) { ++ Block block = world.getType(i1, k1, j1); ++ ++ if (!this.a(block)) { ++ flag = false; ++ } ++ } else { ++ flag = false; ++ } ++ } ++ } ++ } ++ ++ if (!flag) { ++ return false; ++ } else { ++ Block block1 = world.getType(i, j - 1, k); ++ ++ if ((block1 == Blocks.GRASS || block1 == Blocks.DIRT) && j < 256 - l - 1) { ++ this.setType(world, i, j - 1, k, Blocks.DIRT); ++ this.setType(world, i + 1, j - 1, k, Blocks.DIRT); ++ this.setType(world, i + 1, j - 1, k + 1, Blocks.DIRT); ++ this.setType(world, i, j - 1, k + 1, Blocks.DIRT); ++ int l1 = random.nextInt(4); ++ ++ i1 = l - random.nextInt(4); ++ j1 = 2 - random.nextInt(3); ++ int i2 = i; ++ int j2 = k; ++ int k2 = 0; ++ ++ int l2; ++ int i3; ++ ++ for (l2 = 0; l2 < l; ++l2) { ++ i3 = j + l2; ++ if (l2 >= i1 && j1 > 0) { ++ i2 += Direction.a[l1]; ++ j2 += Direction.b[l1]; ++ --j1; ++ } ++ ++ Block block2 = world.getType(i2, i3, j2); ++ ++ if (block2.getMaterial() == Material.AIR || block2.getMaterial() == Material.LEAVES) { ++ this.setTypeAndData(world, i2, i3, j2, Blocks.LOG2, 1); ++ this.setTypeAndData(world, i2 + 1, i3, j2, Blocks.LOG2, 1); ++ this.setTypeAndData(world, i2, i3, j2 + 1, Blocks.LOG2, 1); ++ this.setTypeAndData(world, i2 + 1, i3, j2 + 1, Blocks.LOG2, 1); ++ k2 = i3; ++ } ++ } ++ ++ for (l2 = -2; l2 <= 0; ++l2) { ++ for (i3 = -2; i3 <= 0; ++i3) { ++ byte b1 = -1; ++ ++ this.a(world, i2 + l2, k2 + b1, j2 + i3); ++ this.a(world, 1 + i2 - l2, k2 + b1, j2 + i3); ++ this.a(world, i2 + l2, k2 + b1, 1 + j2 - i3); ++ this.a(world, 1 + i2 - l2, k2 + b1, 1 + j2 - i3); ++ if ((l2 > -2 || i3 > -1) && (l2 != -1 || i3 != -2)) { ++ byte b2 = 1; ++ ++ this.a(world, i2 + l2, k2 + b2, j2 + i3); ++ this.a(world, 1 + i2 - l2, k2 + b2, j2 + i3); ++ this.a(world, i2 + l2, k2 + b2, 1 + j2 - i3); ++ this.a(world, 1 + i2 - l2, k2 + b2, 1 + j2 - i3); ++ } ++ } ++ } ++ ++ if (random.nextBoolean()) { ++ this.a(world, i2, k2 + 2, j2); ++ this.a(world, i2 + 1, k2 + 2, j2); ++ this.a(world, i2 + 1, k2 + 2, j2 + 1); ++ this.a(world, i2, k2 + 2, j2 + 1); ++ } ++ ++ for (l2 = -3; l2 <= 4; ++l2) { ++ for (i3 = -3; i3 <= 4; ++i3) { ++ if ((l2 != -3 || i3 != -3) && (l2 != -3 || i3 != 4) && (l2 != 4 || i3 != -3) && (l2 != 4 || i3 != 4) && (Math.abs(l2) < 3 || Math.abs(i3) < 3)) { ++ this.a(world, i2 + l2, k2, j2 + i3); ++ } ++ } ++ } ++ ++ for (l2 = -1; l2 <= 2; ++l2) { ++ for (i3 = -1; i3 <= 2; ++i3) { ++ if ((l2 < 0 || l2 > 1 || i3 < 0 || i3 > 1) && random.nextInt(3) <= 0) { ++ int j3 = random.nextInt(3) + 2; ++ ++ int k3; ++ ++ for (k3 = 0; k3 < j3; ++k3) { ++ this.setTypeAndData(world, i + l2, k2 - k3 - 1, k + i3, Blocks.LOG2, 1); ++ } ++ ++ int l3; ++ ++ for (k3 = -1; k3 <= 1; ++k3) { ++ for (l3 = -1; l3 <= 1; ++l3) { ++ this.a(world, i2 + l2 + k3, k2 - 0, j2 + i3 + l3); ++ } ++ } ++ ++ for (k3 = -2; k3 <= 2; ++k3) { ++ for (l3 = -2; l3 <= 2; ++l3) { ++ if (Math.abs(k3) != 2 || Math.abs(l3) != 2) { ++ this.a(world, i2 + l2 + k3, k2 - 1, j2 + i3 + l3); ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ return true; ++ } else { ++ return false; ++ } ++ } ++ } else { ++ return false; ++ } ++ } ++ ++ private void a(World world, int i, int j, int k) { ++ Block block = world.getType(i, j, k); ++ ++ if (block.getMaterial() == Material.AIR) { ++ this.setTypeAndData(world, i, j, k, Blocks.LEAVES2, 1); ++ } ++ } ++} diff --git a/src/main/java/net/minecraft/server/WorldGenPackedIce2.java b/src/main/java/net/minecraft/server/WorldGenPackedIce2.java new file mode 100644 index 0000000..c0db754 diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index fad0ee3071..5dc468af59 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,14 +1,14 @@ -From d27a502bbf00ddc7a8a4ddd243de26f3499acd13 Mon Sep 17 00:00:00 2001 +From 8a4ee6ed2b429e8fd918e873729b38b208c19422 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4590a71..a97e330 100644 +index 8ef5509..c7c6a6f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1284,4 +1284,14 @@ public class CraftWorld implements World { +@@ -1310,4 +1310,14 @@ public class CraftWorld implements World { cps.queueUnload(chunk.locX, chunk.locZ); } } diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index 19138e21c2..dcfe7d6f93 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 6628f676976dcfee3abcc10ce6bcc2fc30bb7bf0 Mon Sep 17 00:00:00 2001 +From 65856207ce4a6941e16aee9636f85f6209b07f85 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -34,10 +34,10 @@ index f1caa38..00f9b89 100644 if (!this.getOnlineMode()) { i.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e6bb1d5..4567ee2 100644 +index bbf61a3..fab5025 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -103,6 +103,7 @@ public abstract class World implements IBlockAccess { +@@ -106,6 +106,7 @@ public abstract class World implements IBlockAccess { public boolean pvpMode; public boolean keepSpawnInMemory = true; public ChunkGenerator generator; @@ -45,7 +45,7 @@ index e6bb1d5..4567ee2 100644 public CraftWorld getWorld() { return this.world; -@@ -114,6 +115,7 @@ public abstract class World implements IBlockAccess { +@@ -117,6 +118,7 @@ public abstract class World implements IBlockAccess { // Changed signature - added gen and env public World(IDataManager idatamanager, String s, WorldSettings worldsettings, WorldProvider worldprovider, MethodProfiler methodprofiler, ChunkGenerator gen, org.bukkit.World.Environment env) { diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch index 8d9e299d8e..46b88c6eb9 100644 --- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch @@ -1,14 +1,14 @@ -From 644d19dee7e8c63e7dce45426b0365e00633d1e9 Mon Sep 17 00:00:00 2001 +From e380a7c833bf83afcc83bbc477466f1266441288 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:56:02 +1000 Subject: [PATCH] Better Chunk Tick Selection diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4567ee2..234ea35 100644 +index fab5025..93b7a72 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -61,7 +61,7 @@ public abstract class World implements IBlockAccess { +@@ -62,7 +62,7 @@ public abstract class World implements IBlockAccess { public Scoreboard scoreboard = new Scoreboard(); // CraftBukkit - protected -> public public boolean isStatic; // CraftBukkit start - public, longhashset @@ -17,7 +17,7 @@ index 4567ee2..234ea35 100644 private int K; public boolean allowMonsters; public boolean allowAnimals; -@@ -76,6 +76,30 @@ public abstract class World implements IBlockAccess { +@@ -79,6 +79,30 @@ public abstract class World implements IBlockAccess { private boolean M; int[] I; @@ -48,7 +48,7 @@ index 4567ee2..234ea35 100644 public BiomeBase getBiome(int i, int j) { if (this.isLoaded(i, 0, j)) { Chunk chunk = this.getChunkAtWorldCoords(i, j); -@@ -121,6 +145,11 @@ public abstract class World implements IBlockAccess { +@@ -124,6 +148,11 @@ public abstract class World implements IBlockAccess { this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit // CraftBukkit end @@ -60,7 +60,7 @@ index 4567ee2..234ea35 100644 this.K = this.random.nextInt(12000); this.allowMonsters = true; -@@ -1900,24 +1929,44 @@ public abstract class World implements IBlockAccess { +@@ -1990,24 +2019,44 @@ public abstract class World implements IBlockAccess { int k; int l; @@ -93,13 +93,12 @@ index 4567ee2..234ea35 100644 - continue; - } - // CraftBukkit end -- -- this.chunkTickList.add(org.bukkit.craftbukkit.util.LongHash.toLong(i1 + j, j1 + k)); // CraftBukkit + // Spigot start - Always update the chunk the player is on + long key = chunkToKey( j, k ); + int existingPlayers = Math.max( 0, chunkTickList.get( key ) ); // filter out -1 + chunkTickList.put(key, (short) (existingPlayers + 1)); -+ + +- this.chunkTickList.add(org.bukkit.craftbukkit.util.LongHash.toLong(i1 + j, j1 + k)); // CraftBukkit + // Check and see if we update the chunks surrounding the player this tick + for ( int chunk = 0; chunk < chunksPerPlayer; chunk++ ) + { @@ -116,10 +115,10 @@ index 4567ee2..234ea35 100644 this.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 843761a..01d7105 100644 +index 3fa3a81..9b5b370 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -307,10 +307,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -307,10 +307,20 @@ public class WorldServer extends World { // CraftBukkit start // Iterator iterator = this.chunkTickList.iterator(); @@ -143,7 +142,7 @@ index 843761a..01d7105 100644 int k = chunkX * 16; int l = chunkZ * 16; -@@ -401,6 +411,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -401,6 +411,7 @@ public class WorldServer extends World { if (block.isTicking()) { ++i; @@ -151,7 +150,7 @@ index 843761a..01d7105 100644 block.a(this, k2 + k, i3 + chunksection.getYPosition(), l2 + l, this.random); } } -@@ -409,6 +420,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -409,6 +420,12 @@ public class WorldServer extends World { this.methodProfiler.b(); } diff --git a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch index 3cc5125e4f..d58329bc6f 100644 --- a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From 8f23df6817bcc4059768dab7547232f77f2616f1 Mon Sep 17 00:00:00 2001 +From 1e1bd1813fe7ea78783f98d772faa52ba59005f6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:17:20 +1000 Subject: [PATCH] Crop Growth Rates @@ -66,10 +66,10 @@ index abd991b..7c00158 100644 int j1 = j + random.nextInt(5) - 3; int k1 = k + random.nextInt(3) - 1; diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java -index 75fe4c0..adb90b6 100644 +index 5b90eb9..c720a7f 100644 --- a/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/src/main/java/net/minecraft/server/BlockMushroom.java -@@ -23,7 +23,7 @@ public class BlockMushroom extends BlockPlant implements IBlockFragilePlantEleme +@@ -19,7 +19,7 @@ public class BlockMushroom extends BlockPlant implements IBlockFragilePlantEleme public void a(World world, int i, int j, int k, Random random) { final int sourceX = i, sourceY = j, sourceZ = k; // CraftBukkit @@ -106,18 +106,18 @@ index a1350f6..6c04ad2 100644 world.setData(i, j, k, 0, 4); } else { diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java -index 830eb65..24c95ef 100644 +index ab8b07c..348a00e 100644 --- a/src/main/java/net/minecraft/server/BlockSapling.java +++ b/src/main/java/net/minecraft/server/BlockSapling.java -@@ -26,7 +26,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen +@@ -27,7 +27,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen public void a(World world, int i, int j, int k, Random random) { if (!world.isStatic) { super.a(world, i, j, k, random); - if (world.getLightLevel(i, j + 1, k) >= 9 && random.nextInt(7) == 0) { + if (world.getLightLevel(i, j + 1, k) >= 9 && (random.nextInt(Math.max(2, (int) ((world.growthOdds / world.spigotConfig.saplingModifier * 7) + 0.5F))) == 0)) { // Spigot - this.grow(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack - } - } + // CraftBukkit start + world.captureTreeGeneration = true; + // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java index 40ad1c6..b37b187 100644 --- a/src/main/java/net/minecraft/server/BlockStem.java diff --git a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch index f42472db08..dc897bc741 100644 --- a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From c5a0b8b2d97cc9d0dce80bdfabb8e99be69a68fd Mon Sep 17 00:00:00 2001 +From 786430e30804b7dee65a70750df4e95e1b35f546 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -41,10 +41,10 @@ index 8343ac9..95beb11 100644 } } else { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 234ea35..b7aed63 100644 +index 93b7a72..61610f6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -917,6 +917,23 @@ public abstract class World implements IBlockAccess { +@@ -1007,6 +1007,23 @@ public abstract class World implements IBlockAccess { // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead event = CraftEventFactory.callProjectileLaunchEvent(entity); } diff --git a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch index 584fc71e4e..13888e4f49 100644 --- a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 728c17c2a96cb836ffe6a3449454cb8d4173753b Mon Sep 17 00:00:00 2001 +From 34d6b850d27725d6934a91a92645e7de92370b58 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -66,10 +66,10 @@ index c148c4d..a2b54a4 100644 this.trackedPlayers.remove(entityplayer); entityplayer.d(this.tracker); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b7aed63..1ec7267 100644 +index 61610f6..1031066 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -886,6 +886,7 @@ public abstract class World implements IBlockAccess { +@@ -976,6 +976,7 @@ public abstract class World implements IBlockAccess { } public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason @@ -77,7 +77,7 @@ index b7aed63..1ec7267 100644 if (entity == null) return false; // CraftBukkit end -@@ -992,6 +993,7 @@ public abstract class World implements IBlockAccess { +@@ -1082,6 +1083,7 @@ public abstract class World implements IBlockAccess { } public void removeEntity(Entity entity) { @@ -85,7 +85,7 @@ index b7aed63..1ec7267 100644 entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); -@@ -2376,6 +2378,7 @@ public abstract class World implements IBlockAccess { +@@ -2466,6 +2468,7 @@ public abstract class World implements IBlockAccess { } public void a(List list) { @@ -94,10 +94,10 @@ index b7aed63..1ec7267 100644 // this.entityList.addAll(list); Entity entity = null; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a97e330..1f26312 100644 +index c7c6a6f..452f6f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -159,6 +159,7 @@ public class CraftWorld implements World { +@@ -162,6 +162,7 @@ public class CraftWorld implements World { } public boolean unloadChunkRequest(int x, int z, boolean safe) { @@ -105,7 +105,7 @@ index a97e330..1f26312 100644 if (safe && isChunkInUse(x, z)) { return false; } -@@ -169,6 +170,7 @@ public class CraftWorld implements World { +@@ -172,6 +173,7 @@ public class CraftWorld implements World { } public boolean unloadChunk(int x, int z, boolean save, boolean safe) { @@ -113,7 +113,7 @@ index a97e330..1f26312 100644 if (safe && isChunkInUse(x, z)) { return false; } -@@ -236,6 +238,7 @@ public class CraftWorld implements World { +@@ -239,6 +241,7 @@ public class CraftWorld implements World { } public boolean loadChunk(int x, int z, boolean generate) { diff --git a/CraftBukkit-Patches/0012-View-Distance.patch b/CraftBukkit-Patches/0012-View-Distance.patch index 74f5fb667c..be6ffa8104 100644 --- a/CraftBukkit-Patches/0012-View-Distance.patch +++ b/CraftBukkit-Patches/0012-View-Distance.patch @@ -1,4 +1,4 @@ -From f32fdf0a346328efdfa057b39d0e7503dd0d1713 Mon Sep 17 00:00:00 2001 +From e58171001d40f747655e603fd0fdc2701be5e465 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -22,10 +22,10 @@ index ae53635..cc1b095 100644 public WorldServer a() { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 01d7105..0192dc5 100644 +index 9b5b370..3d938d8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -55,7 +55,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -55,7 +55,7 @@ public class WorldServer extends World { // CraftBukkit end this.server = minecraftserver; this.tracker = new EntityTracker(this); @@ -51,5 +51,5 @@ index 1545a61..6cc3a91 100644 + } } -- -1.8.3.2 +1.9.1 diff --git a/CraftBukkit-Patches/0014-Improved-Timings-System.patch b/CraftBukkit-Patches/0014-Improved-Timings-System.patch index 1bd17eda4b..8603bac902 100644 --- a/CraftBukkit-Patches/0014-Improved-Timings-System.patch +++ b/CraftBukkit-Patches/0014-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From e7d290ae1d04ca8c5b9e6868c4d01dc953e0d7d9 Mon Sep 17 00:00:00 2001 +From 151ed358c7071fc7ff19e3a0c0e54f294d10889d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Improved Timings System @@ -192,18 +192,18 @@ index 2a3d647..78e17d7 100644 private static Map i = new HashMap(); private static Map j = new HashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1ec7267..5d593eb 100644 +index 1031066..6946e31 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -15,6 +15,7 @@ import java.util.concurrent.Callable; - import org.bukkit.Bukkit; +@@ -16,6 +16,7 @@ import org.bukkit.Bukkit; + import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.craftbukkit.util.LongHashSet; +import org.bukkit.craftbukkit.SpigotTimings; // Spigot import org.bukkit.generator.ChunkGenerator; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; -@@ -129,6 +130,8 @@ public abstract class World implements IBlockAccess { +@@ -132,6 +133,8 @@ public abstract class World implements IBlockAccess { public ChunkGenerator generator; public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot @@ -212,7 +212,7 @@ index 1ec7267..5d593eb 100644 public CraftWorld getWorld() { return this.world; } -@@ -208,6 +211,7 @@ public abstract class World implements IBlockAccess { +@@ -211,6 +214,7 @@ public abstract class World implements IBlockAccess { this.a(); this.getServer().addWorld(this.world); // CraftBukkit @@ -220,7 +220,7 @@ index 1ec7267..5d593eb 100644 } protected abstract IChunkProvider j(); -@@ -1224,6 +1228,7 @@ public abstract class World implements IBlockAccess { +@@ -1314,6 +1318,7 @@ public abstract class World implements IBlockAccess { this.f.clear(); this.methodProfiler.c("regular"); @@ -228,7 +228,7 @@ index 1ec7267..5d593eb 100644 // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { entity = (Entity) this.entityList.get(this.tickPosition); -@@ -1247,7 +1252,9 @@ public abstract class World implements IBlockAccess { +@@ -1337,7 +1342,9 @@ public abstract class World implements IBlockAccess { this.methodProfiler.a("tick"); if (!entity.dead) { try { @@ -238,7 +238,7 @@ index 1ec7267..5d593eb 100644 } catch (Throwable throwable1) { crashreport = CrashReport.a(throwable1, "Ticking entity"); crashreportsystemdetails = crashreport.a("Entity being ticked"); -@@ -1272,7 +1279,9 @@ public abstract class World implements IBlockAccess { +@@ -1362,7 +1369,9 @@ public abstract class World implements IBlockAccess { this.methodProfiler.b(); } @@ -248,7 +248,7 @@ index 1ec7267..5d593eb 100644 this.M = true; Iterator iterator = this.tileEntityList.iterator(); -@@ -1287,8 +1296,11 @@ public abstract class World implements IBlockAccess { +@@ -1377,8 +1386,11 @@ public abstract class World implements IBlockAccess { if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) { try { @@ -260,7 +260,7 @@ index 1ec7267..5d593eb 100644 crashreport = CrashReport.a(throwable2, "Ticking block entity"); crashreportsystemdetails = crashreport.a("Block entity being ticked"); tileentity.a(crashreportsystemdetails); -@@ -1308,6 +1320,8 @@ public abstract class World implements IBlockAccess { +@@ -1398,6 +1410,8 @@ public abstract class World implements IBlockAccess { } } @@ -269,7 +269,7 @@ index 1ec7267..5d593eb 100644 this.M = false; if (!this.b.isEmpty()) { this.tileEntityList.removeAll(this.b); -@@ -1346,6 +1360,7 @@ public abstract class World implements IBlockAccess { +@@ -1436,6 +1450,7 @@ public abstract class World implements IBlockAccess { this.a.clear(); } @@ -277,7 +277,7 @@ index 1ec7267..5d593eb 100644 this.methodProfiler.b(); this.methodProfiler.b(); } -@@ -1368,6 +1383,7 @@ public abstract class World implements IBlockAccess { +@@ -1458,6 +1473,7 @@ public abstract class World implements IBlockAccess { byte b0 = 32; if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) { @@ -285,7 +285,7 @@ index 1ec7267..5d593eb 100644 entity.S = entity.locX; entity.T = entity.locY; entity.U = entity.locZ; -@@ -1429,6 +1445,7 @@ public abstract class World implements IBlockAccess { +@@ -1519,6 +1535,7 @@ public abstract class World implements IBlockAccess { entity.passenger = null; } } @@ -294,10 +294,10 @@ index 1ec7267..5d593eb 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0192dc5..a5e0e13 100644 +index 3d938d8..2dc3a13 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -185,10 +185,13 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -185,10 +185,13 @@ public class WorldServer extends World { // CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals long time = this.worldData.getTime(); if (this.getGameRules().getBoolean("doMobSpawning") && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) { @@ -311,7 +311,7 @@ index 0192dc5..a5e0e13 100644 this.methodProfiler.c("chunkSource"); this.chunkProvider.unloadChunks(); int j = this.a(1.0F); -@@ -202,21 +205,36 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate +@@ -202,21 +205,36 @@ public class WorldServer extends World { this.worldData.setDayTime(this.worldData.getDayTime() + 1L); } diff --git a/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch index 95c61f9b18..df85c9b906 100644 --- a/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,11 +1,11 @@ -From 2dc506017149739aad757a34429cf94162128195 Mon Sep 17 00:00:00 2001 +From ce050d2da89fea40fc1459aaa5a03ba3f9e6172c Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:29:54 +1000 Subject: [PATCH] Fix Mob Spawning Relative to View Distance diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 771eab3..0110120 100644 +index ade0c35..0eabadf 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -40,6 +40,7 @@ public class Chunk { @@ -16,7 +16,7 @@ index 771eab3..0110120 100644 public Chunk(World world, int i, int j) { this.sections = new ChunkSection[16]; -@@ -612,6 +613,22 @@ public class Chunk { +@@ -607,6 +608,22 @@ public class Chunk { entity.ai = k; entity.aj = this.locZ; this.entitySlices[k].add(entity); @@ -39,7 +39,7 @@ index 771eab3..0110120 100644 } public void b(Entity entity) { -@@ -628,6 +645,22 @@ public class Chunk { +@@ -623,6 +640,22 @@ public class Chunk { } this.entitySlices[i].remove(entity); diff --git a/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch index 47b94f352d..f6b7960de7 100644 --- a/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch @@ -1,14 +1,14 @@ -From 48a3d1610d2a0c0bcec6e3c6ed550feb355b90de Mon Sep 17 00:00:00 2001 +From d1136b68975bc071ece95a4691de2aac820264e7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Handle Null Tile Entities diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5d593eb..5246abd 100644 +index 6946e31..e0daffb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1287,6 +1287,13 @@ public abstract class World implements IBlockAccess { +@@ -1377,6 +1377,13 @@ public abstract class World implements IBlockAccess { while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); diff --git a/CraftBukkit-Patches/0017-Entity-Activation-Range.patch b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch index 26156c165b..76a4fb2bf3 100644 --- a/CraftBukkit-Patches/0017-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From d640bc886bb0e8d0a9f820d151af56120e09be57 Mon Sep 17 00:00:00 2001 +From 7ee37a400f775d11d94b1382912ea39316871ff5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -155,10 +155,10 @@ index f90e2a3..6c77253 100644 public EntityLiving(World world) { super(world); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5246abd..508c059 100644 +index e0daffb..1a2a640 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1228,6 +1228,7 @@ public abstract class World implements IBlockAccess { +@@ -1318,6 +1318,7 @@ public abstract class World implements IBlockAccess { this.f.clear(); this.methodProfiler.c("regular"); @@ -166,7 +166,7 @@ index 5246abd..508c059 100644 timings.entityTick.startTiming(); // Spigot // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { -@@ -1389,7 +1390,11 @@ public abstract class World implements IBlockAccess { +@@ -1479,7 +1480,11 @@ public abstract class World implements IBlockAccess { int j = MathHelper.floor(entity.locZ); byte b0 = 32; diff --git a/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch index 661cbdb3e7..2f1e772805 100644 --- a/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch @@ -1,14 +1,14 @@ -From e215ab2e0adac57fc67baa5b4b4fbce4ceb1591b Mon Sep 17 00:00:00 2001 +From 05af846b96eabf3961284ab159e1f1dcd88ae1da Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 791467b..cc18816 100644 +index bae352b..52ff8e6 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -176,7 +176,13 @@ public final class ItemStack { +@@ -259,7 +259,13 @@ public final class ItemStack { return this.item.getMaxDurability(); } @@ -22,7 +22,7 @@ index 791467b..cc18816 100644 if (!this.g()) { return false; } else { -@@ -191,7 +197,16 @@ public final class ItemStack { +@@ -274,7 +280,16 @@ public final class ItemStack { } i -= k; @@ -40,7 +40,7 @@ index 791467b..cc18816 100644 return false; } } -@@ -204,7 +219,7 @@ public final class ItemStack { +@@ -287,7 +302,7 @@ public final class ItemStack { public void damage(int i, EntityLiving entityliving) { if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) { if (this.g()) { diff --git a/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch index 23ec0efd24..da00a73b59 100644 --- a/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 6283d084b9bd9e85048c6c422bff8533cdc6c44f Mon Sep 17 00:00:00 2001 +From 722ea3f2c86af3f7e5819e4766f6211b3898cd17 Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:37 -0500 Subject: [PATCH] Implement SpawnerSpawnEvent. @@ -63,7 +63,7 @@ index 06f9b1f..b97ac4b 100644 return entity; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 30f31d1..22e2879 100644 +index 522d6b0..9a3c728 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type; @@ -74,7 +74,7 @@ index 30f31d1..22e2879 100644 import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftStatistic; import org.bukkit.craftbukkit.CraftWorld; -@@ -120,6 +121,22 @@ public class CraftEventFactory { +@@ -141,6 +142,22 @@ public class CraftEventFactory { } /** diff --git a/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch index 940f1aa440..43fd54ffc0 100644 --- a/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,14 +1,14 @@ -From b42bf264aecbc8ba6c9fa45752ad7e30222cd3c7 Mon Sep 17 00:00:00 2001 +From bb365c0a557eccb818ffb7a4d018144a654e9b15 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:12:02 +1000 Subject: [PATCH] Allow Disabling of Random Lighting Updates diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0110120..96974b4 100644 +index 0eabadf..a638dba 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -906,7 +906,7 @@ public class Chunk { +@@ -901,7 +901,7 @@ public class Chunk { } this.m = true; @@ -18,10 +18,10 @@ index 0110120..96974b4 100644 } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 508c059..932686f 100644 +index 1a2a640..ec4ce72 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2023,7 +2023,7 @@ public abstract class World implements IBlockAccess { +@@ -2113,7 +2113,7 @@ public abstract class World implements IBlockAccess { } this.methodProfiler.a("playerCheckLight"); diff --git a/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch index b678e290cb..c89049908b 100644 --- a/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From fb9bbf03b51a2dd8d11d94ffb61ae53668b7d3d7 Mon Sep 17 00:00:00 2001 +From f6c37960464a932e6125c8bd19c8288743eb42ea Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 27 Jun 2013 17:26:09 +1000 Subject: [PATCH] Properly Close Inventories @@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories Properly close inventories when unloading and switching worlds. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 96974b4..3fc83e5 100644 +index a638dba..d0c00db 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -760,6 +760,15 @@ public class Chunk { +@@ -755,6 +755,15 @@ public class Chunk { while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); @@ -25,7 +25,7 @@ index 96974b4..3fc83e5 100644 this.world.a(tileentity); } -@@ -769,6 +778,15 @@ public class Chunk { +@@ -764,6 +773,15 @@ public class Chunk { java.util.Iterator iter = this.entitySlices[i].iterator(); while (iter.hasNext()) { Entity entity = (Entity) iter.next(); diff --git a/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch index c4a875f906..ff94d0d594 100644 --- a/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch +++ b/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch @@ -1,4 +1,4 @@ -From 9d2e1c3bc82d814be967daa62994dcc080384945 Mon Sep 17 00:00:00 2001 +From 8b366c63f86ae90d9629fdd258d972ec64db1ff8 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Tue, 16 Jul 2013 03:32:32 +0500 Subject: [PATCH] Entity ticking chunk caching @@ -6,10 +6,10 @@ Subject: [PATCH] Entity ticking chunk caching Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 932686f..2f7be96 100644 +index ec4ce72..6da7de6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1173,6 +1173,7 @@ public abstract class World implements IBlockAccess { +@@ -1263,6 +1263,7 @@ public abstract class World implements IBlockAccess { CrashReport crashreport; CrashReportSystemDetails crashreportsystemdetails; @@ -17,7 +17,7 @@ index 932686f..2f7be96 100644 for (i = 0; i < this.i.size(); ++i) { entity = (Entity) this.i.get(i); // CraftBukkit start - Fixed an NPE, don't process entities in chunks queued for unload -@@ -1181,10 +1182,15 @@ public abstract class World implements IBlockAccess { +@@ -1271,10 +1272,15 @@ public abstract class World implements IBlockAccess { } ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer; @@ -35,7 +35,7 @@ index 932686f..2f7be96 100644 try { ++entity.ticksLived; -@@ -1205,6 +1211,7 @@ public abstract class World implements IBlockAccess { +@@ -1295,6 +1301,7 @@ public abstract class World implements IBlockAccess { this.i.remove(i--); } } @@ -43,7 +43,7 @@ index 932686f..2f7be96 100644 this.methodProfiler.c("remove"); this.entityList.removeAll(this.f); -@@ -1236,10 +1243,15 @@ public abstract class World implements IBlockAccess { +@@ -1326,10 +1333,15 @@ public abstract class World implements IBlockAccess { // Don't tick entities in chunks queued for unload ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer; diff --git a/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch index 43d42e87a0..bb22265873 100644 --- a/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,14 +1,14 @@ -From 97d4b54cc547e0c2efcfdf583831c8d7c71e4c9c Mon Sep 17 00:00:00 2001 +From 5121ec7814ce666e9acb92aaf65013265054396a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 2 Dec 2013 23:42:09 +0000 Subject: [PATCH] Fix some chunks not being sent to the client diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 3fc83e5..3712009 100644 +index d0c00db..874a089 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -930,7 +930,15 @@ public class Chunk { +@@ -925,7 +925,15 @@ public class Chunk { } public boolean k() { diff --git a/CraftBukkit-Patches/0063-Orebfuscator.patch b/CraftBukkit-Patches/0063-Orebfuscator.patch index e3f036b2b4..39de8e64b1 100644 --- a/CraftBukkit-Patches/0063-Orebfuscator.patch +++ b/CraftBukkit-Patches/0063-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 291d52ba09c9f3c0d718845f8050406fd67f3298 Mon Sep 17 00:00:00 2001 +From 4721d9011f520f9764d8dd4d429e2d000f57a859 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -115,10 +115,10 @@ index 2db45ad..97fe53c 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2f7be96..7485d07 100644 +index 6da7de6..2de7e62 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -458,6 +458,7 @@ public abstract class World implements IBlockAccess { +@@ -548,6 +548,7 @@ public abstract class World implements IBlockAccess { this.e(i, j + 1, k, block); this.e(i, j, k - 1, block); this.e(i, j, k + 1, block); diff --git a/CraftBukkit-Patches/0071-Particle-API.patch b/CraftBukkit-Patches/0071-Particle-API.patch index c7353c7b8a..931e01692f 100644 --- a/CraftBukkit-Patches/0071-Particle-API.patch +++ b/CraftBukkit-Patches/0071-Particle-API.patch @@ -1,4 +1,4 @@ -From 58a7ca9681577897b5d7ccdb9ae8f6db43c027cf Mon Sep 17 00:00:00 2001 +From bc6f8371fb5e19fb85b9906114623ee141fb3baf Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -18,10 +18,10 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1f26312..58c64fd 100644 +index 452f6f3..a36297d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -779,28 +779,18 @@ public class CraftWorld implements World { +@@ -805,28 +805,18 @@ public class CraftWorld implements World { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -59,7 +59,7 @@ index 1f26312..58c64fd 100644 } public T spawn(Location location, Class clazz) throws IllegalArgumentException { -@@ -1290,6 +1280,56 @@ public class CraftWorld implements World { +@@ -1316,6 +1306,56 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch index 57d84197fd..7c735ade2e 100644 --- a/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch @@ -1,14 +1,14 @@ -From 28644f9ab3b3cd71aad60850537ec7248db6e5f6 Mon Sep 17 00:00:00 2001 +From fa881e4c93207dd4134cb33d0c35d30837ec0f30 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:17:37 +1000 Subject: [PATCH] More Efficient GetCubes diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7485d07..aa3547e 100644 +index 2de7e62..eb6772a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1038,23 +1038,42 @@ public abstract class World implements IBlockAccess { +@@ -1128,23 +1128,42 @@ public abstract class World implements IBlockAccess { int i1 = MathHelper.floor(axisalignedbb.c); int j1 = MathHelper.floor(axisalignedbb.f + 1.0D); diff --git a/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch index 5cb191500f..744f3b4094 100644 --- a/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch @@ -1,14 +1,14 @@ -From 8d3c0de3c0e455a06c338d75405d6549603063f7 Mon Sep 17 00:00:00 2001 +From 111a7bac3315b2f8a751faf88a471a41684aa833 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 10 Jan 2014 15:15:50 +1100 Subject: [PATCH] Fix ItemStack Unbreakable Code diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index cc18816..a535479 100644 +index 52ff8e6..a0050ba 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -130,7 +130,13 @@ public final class ItemStack { +@@ -213,7 +213,13 @@ public final class ItemStack { } public boolean g() { diff --git a/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch b/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch index 4b6f61d3bb..6687eb970e 100644 --- a/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch +++ b/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch @@ -1,11 +1,11 @@ -From a8d96be1342208847066046da8804175a4f4925d Mon Sep 17 00:00:00 2001 +From bf0e4ceeed93592042942a2b81f3e7fe4ddf00d9 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 15 Jan 2014 21:52:47 +0000 Subject: [PATCH] Block data values that crash the client diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 3712009..90f32ed 100644 +index 874a089..364df1d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -115,7 +115,7 @@ public class Chunk { @@ -44,7 +44,7 @@ index 3712009..90f32ed 100644 if (flag) { this.initLighting(); } else { -@@ -522,8 +533,9 @@ public class Chunk { +@@ -517,8 +528,9 @@ public class Chunk { return false; } else { this.n = true; diff --git a/CraftBukkit-Patches/0090-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0089-Highly-Optimized-Tick-Loop.patch similarity index 99% rename from CraftBukkit-Patches/0090-Highly-Optimized-Tick-Loop.patch rename to CraftBukkit-Patches/0089-Highly-Optimized-Tick-Loop.patch index 296506b6cc..910216acb0 100644 --- a/CraftBukkit-Patches/0090-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0089-Highly-Optimized-Tick-Loop.patch @@ -1,4 +1,4 @@ -From b7b1ae0e44dcb5366584904a8227d480a4ed7600 Mon Sep 17 00:00:00 2001 +From 8e6c2a43319001a39199a60b3435577ff1c4cc33 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/CraftBukkit-Patches/0091-Add-Spigot-Links.patch b/CraftBukkit-Patches/0090-Add-Spigot-Links.patch similarity index 98% rename from CraftBukkit-Patches/0091-Add-Spigot-Links.patch rename to CraftBukkit-Patches/0090-Add-Spigot-Links.patch index 85b6d1be09..8251c096e2 100644 --- a/CraftBukkit-Patches/0091-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0090-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 70b888d12018b159ad7b30a637b580951e0903e1 Mon Sep 17 00:00:00 2001 +From e0e673c3dbff7904186f713e0b1ef54568b6abb1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 23 Jan 2014 13:17:35 +1100 Subject: [PATCH] Add Spigot Links diff --git a/CraftBukkit-Patches/0092-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0091-Configurable-Ping-Sample-Size.patch similarity index 96% rename from CraftBukkit-Patches/0092-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0091-Configurable-Ping-Sample-Size.patch index b4408dda19..8e70b20bc6 100644 --- a/CraftBukkit-Patches/0092-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0091-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From 98083979ea08c5486889194226e0a6b5ae680c82 Mon Sep 17 00:00:00 2001 +From 1b97446f513fa4abd73ab946e1939da69564f9fa Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 26 Jan 2014 21:48:34 +1100 Subject: [PATCH] Configurable Ping Sample Size diff --git a/CraftBukkit-Patches/0093-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0092-Add-Optional-Tick-Shuffling.patch similarity index 96% rename from CraftBukkit-Patches/0093-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0092-Add-Optional-Tick-Shuffling.patch index 8156bdfc58..f5ba6f4064 100644 --- a/CraftBukkit-Patches/0093-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0092-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 1b220d10cd0d54f9de7355c7779757b1a92d89b6 Mon Sep 17 00:00:00 2001 +From 6d560adb68f5723c9b27e540640525e1dfb19133 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Jan 2014 08:39:26 +1100 Subject: [PATCH] Add Optional Tick Shuffling diff --git a/CraftBukkit-Patches/0094-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0093-Allow-Configuring-Chunks-per-Packet.patch similarity index 96% rename from CraftBukkit-Patches/0094-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0093-Allow-Configuring-Chunks-per-Packet.patch index 6c862fd1a6..74ce5c6e15 100644 --- a/CraftBukkit-Patches/0094-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0093-Allow-Configuring-Chunks-per-Packet.patch @@ -1,4 +1,4 @@ -From 80b0379300d9010caf8a13499db2eb2746c6a614 Mon Sep 17 00:00:00 2001 +From 1474f1e108ece78d16615117203e8da18ae924d4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 28 Jan 2014 20:35:35 +1100 Subject: [PATCH] Allow Configuring Chunks per Packet diff --git a/CraftBukkit-Patches/0095-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0094-Implement-Locale-Getter-for-Players.patch similarity index 95% rename from CraftBukkit-Patches/0095-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0094-Implement-Locale-Getter-for-Players.patch index 8adde82ad1..3f9c1df4d6 100644 --- a/CraftBukkit-Patches/0095-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0094-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From e9fe48eb126181b69c610e4c7790cc5f4f27b870 Mon Sep 17 00:00:00 2001 +From f046afa0f552b6b76fc5edeaca35ac64353c308d Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/CraftBukkit-Patches/0096-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch similarity index 97% rename from CraftBukkit-Patches/0096-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch index 7e6b192eb5..8c37b199ec 100644 --- a/CraftBukkit-Patches/0096-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From d71c30736ed83ce5cc77cba983ac0d74c9a75bf5 Mon Sep 17 00:00:00 2001 +From 42e14e927828be9932f627f80ad68977387cba90 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions diff --git a/CraftBukkit-Patches/0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch similarity index 94% rename from CraftBukkit-Patches/0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch rename to CraftBukkit-Patches/0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 5b924b76b6..2efd2ff347 100644 --- a/CraftBukkit-Patches/0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,4 +1,4 @@ -From e404feef50c6e75ca09bf0aca6c22984fe449358 Mon Sep 17 00:00:00 2001 +From add93632d60b3a3556f0e6336e301cc765c4bc7a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 6 Feb 2014 21:59:20 +0000 Subject: [PATCH] Fix dispensing bone meal not having the correct data value diff --git a/CraftBukkit-Patches/0098-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0097-Spam-Filter-Exclusions.patch similarity index 97% rename from CraftBukkit-Patches/0098-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0097-Spam-Filter-Exclusions.patch index 5d13bf7324..8214517ab7 100644 --- a/CraftBukkit-Patches/0098-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0097-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From aefd749240cd861d2ec2a26b1fccbe2ff4c594e1 Mon Sep 17 00:00:00 2001 +From 8cf7fcadc3da94902569c3f69087d0aba38039dd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 8 Feb 2014 08:13:40 +0000 Subject: [PATCH] Spam Filter Exclusions diff --git a/CraftBukkit-Patches/0099-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0098-Add-Option-to-Silence-CommandBlock-Console.patch similarity index 95% rename from CraftBukkit-Patches/0099-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0098-Add-Option-to-Silence-CommandBlock-Console.patch index 9681251f34..84de3c932f 100644 --- a/CraftBukkit-Patches/0099-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0098-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 319be2ba8054c81bffee539e97855fa0a160ab73 Mon Sep 17 00:00:00 2001 +From afa33ab6dec0316401df456f1076e5e771e74767 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 9 Feb 2014 14:39:01 +1100 Subject: [PATCH] Add Option to Silence CommandBlock Console diff --git a/CraftBukkit-Patches/0100-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch similarity index 93% rename from CraftBukkit-Patches/0100-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch index c0d781f291..b25c6bef1e 100644 --- a/CraftBukkit-Patches/0100-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 829e6ee60d506b022b0da761cc6e927527c484a1 Mon Sep 17 00:00:00 2001 +From 4313d8729d3b334841c344ff81bda7c3d8674081 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/CraftBukkit-Patches/0101-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0100-Allow-Disabling-Creative-Item-Filter.patch similarity index 96% rename from CraftBukkit-Patches/0101-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0100-Allow-Disabling-Creative-Item-Filter.patch index 307baacdba..4305900fbf 100644 --- a/CraftBukkit-Patches/0101-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0100-Allow-Disabling-Creative-Item-Filter.patch @@ -1,4 +1,4 @@ -From afdcd39f4d49e79d5154922552a22ce6b0389407 Mon Sep 17 00:00:00 2001 +From d2c89b878134ac0d1c22b467a1320b305bf93467 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter diff --git a/CraftBukkit-Patches/0102-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0101-Cap-Channel-Registrations.patch similarity index 92% rename from CraftBukkit-Patches/0102-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0101-Cap-Channel-Registrations.patch index e3b3104403..1f9f6cf7db 100644 --- a/CraftBukkit-Patches/0102-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0101-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From 39baed0fad7774a997ffa0458b0bb1a971d8da34 Mon Sep 17 00:00:00 2001 +From 7ba6792c3311566dbf20bd424739c09add59c1fe Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/CraftBukkit-Patches/0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch similarity index 99% rename from CraftBukkit-Patches/0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch rename to CraftBukkit-Patches/0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index d70d5355cd..457a40b2fc 100644 --- a/CraftBukkit-Patches/0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,4 +1,4 @@ -From fdcf14ce34b08518263ebce08493a9f56d347b51 Mon Sep 17 00:00:00 2001 +From 9fc4666047c68200edc492548a235285fb4f7b96 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command diff --git a/CraftBukkit-Patches/0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch similarity index 93% rename from CraftBukkit-Patches/0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch index cca87b3ef4..1f2cd9be36 100644 --- a/CraftBukkit-Patches/0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From 99712343d55ca1d71f967991fa64b0d108d19778 Mon Sep 17 00:00:00 2001 +From 341c258ef803001921a1e91a74d36053dd64884f Mon Sep 17 00:00:00 2001 From: hcherndon Date: Sat, 15 Feb 2014 01:51:20 -0600 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. diff --git a/CraftBukkit-Patches/0105-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch similarity index 95% rename from CraftBukkit-Patches/0105-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch index 6f7e506a46..80f656a91a 100644 --- a/CraftBukkit-Patches/0105-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 4570b01d5993df8e9c1ea3b191402d535c05a3a2 Mon Sep 17 00:00:00 2001 +From 2995956023d62fcda1edc0d7f2f26450e8cd6646 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -37,10 +37,10 @@ index 2fd88c0..35806d1 100644 this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + this.random.nextFloat() * 0.2F); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 58c64fd..19cff55 100644 +index a36297d..ac2b41a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1330,6 +1330,22 @@ public class CraftWorld implements World { +@@ -1356,6 +1356,22 @@ public class CraftWorld implements World { { CraftWorld.this.playEffect( location, effect, 0 ); } diff --git a/CraftBukkit-Patches/0106-Normalize-spaces-on-when-reading-a-chat-packet.patch b/CraftBukkit-Patches/0105-Normalize-spaces-on-when-reading-a-chat-packet.patch similarity index 96% rename from CraftBukkit-Patches/0106-Normalize-spaces-on-when-reading-a-chat-packet.patch rename to CraftBukkit-Patches/0105-Normalize-spaces-on-when-reading-a-chat-packet.patch index 402e027c2f..52bfc135bd 100644 --- a/CraftBukkit-Patches/0106-Normalize-spaces-on-when-reading-a-chat-packet.patch +++ b/CraftBukkit-Patches/0105-Normalize-spaces-on-when-reading-a-chat-packet.patch @@ -1,4 +1,4 @@ -From 57094a1231b173fc72c6a09458bb4463014f9093 Mon Sep 17 00:00:00 2001 +From 2aaa2a94260bdbe00371e1e246800cf7b7c91a4a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 26 Feb 2014 14:45:22 +0000 Subject: [PATCH] Normalize spaces on when reading a chat packet diff --git a/CraftBukkit-Patches/0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0106-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 94% rename from CraftBukkit-Patches/0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0106-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 15b99ed336..72c5c8c4f2 100644 --- a/CraftBukkit-Patches/0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0106-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 472fa25f89d004f94208884760c60e10d0099f94 Mon Sep 17 00:00:00 2001 +From 0571c76298ab24e886ea01e10d98247640eeca0a Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 2 Mar 2014 21:13:46 +0100 Subject: [PATCH] Use one PermissibleBase for all Command Blocks diff --git a/CraftBukkit-Patches/0108-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0107-Prevent-hoppers-from-loading-chunks.patch similarity index 89% rename from CraftBukkit-Patches/0108-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0107-Prevent-hoppers-from-loading-chunks.patch index 9ddf46e196..7b8c8af8f7 100644 --- a/CraftBukkit-Patches/0108-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0107-Prevent-hoppers-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From 44c944690ed4b0d080fce725753966ff3ffd0d0d Mon Sep 17 00:00:00 2001 +From 71c7e576a8b091ad66e1b6991b9a483440e71ee3 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 5 Mar 2014 20:27:27 +0000 Subject: [PATCH] Prevent hoppers from loading chunks diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index baa158b..38e526b 100644 +index e661462..9445139 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -540,6 +540,7 @@ public class TileEntityHopper extends TileEntity implements IHopper { diff --git a/CraftBukkit-Patches/0109-Guard-Entity-List.patch b/CraftBukkit-Patches/0108-Guard-Entity-List.patch similarity index 87% rename from CraftBukkit-Patches/0109-Guard-Entity-List.patch rename to CraftBukkit-Patches/0108-Guard-Entity-List.patch index e6917a80c9..b6ddce11ee 100644 --- a/CraftBukkit-Patches/0109-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0108-Guard-Entity-List.patch @@ -1,14 +1,14 @@ -From 5329a431fb981cbec731b82387798bd0e836821d Mon Sep 17 00:00:00 2001 +From f8bb6e2b0705e799b586ffa687cb0642b2107c22 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 09:03:28 +1100 Subject: [PATCH] Guard Entity List diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index aa3547e..8b3d92c 100644 +index eb6772a..121b3d5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -30,7 +30,32 @@ import org.bukkit.event.weather.ThunderChangeEvent; +@@ -31,7 +31,32 @@ import org.bukkit.event.weather.ThunderChangeEvent; public abstract class World implements IBlockAccess { public boolean d; @@ -42,7 +42,7 @@ index aa3547e..8b3d92c 100644 protected List f = new ArrayList(); public Set tileEntityList = new HashSet(); // CraftBukkit - ArrayList -> HashSet private List a = new ArrayList(); -@@ -78,6 +103,7 @@ public abstract class World implements IBlockAccess { +@@ -81,6 +106,7 @@ public abstract class World implements IBlockAccess { int[] I; // Spigot start @@ -50,7 +50,7 @@ index aa3547e..8b3d92c 100644 protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList; protected float growthOdds = 100; protected float modifiedOdds = 100; -@@ -1257,6 +1283,7 @@ public abstract class World implements IBlockAccess { +@@ -1347,6 +1373,7 @@ public abstract class World implements IBlockAccess { org.spigotmc.ActivationRange.activateEntities(this); // Spigot timings.entityTick.startTiming(); // Spigot @@ -58,7 +58,7 @@ index aa3547e..8b3d92c 100644 // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { entity = (Entity) this.entityList.get(this.tickPosition); -@@ -1305,12 +1332,15 @@ public abstract class World implements IBlockAccess { +@@ -1395,12 +1422,15 @@ public abstract class World implements IBlockAccess { this.getChunkAt(j, k).b(entity); } diff --git a/CraftBukkit-Patches/0110-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0109-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 91% rename from CraftBukkit-Patches/0110-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0109-Fix-ConcurrentModificationException-while-being-idle.patch index eb3d7f7dab..e96225e76f 100644 --- a/CraftBukkit-Patches/0110-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0109-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From c8c9dcd1724707439a8e83892cfb1189a84bb997 Mon Sep 17 00:00:00 2001 +From 4d8c8f9aa54f446f4d8e8e2736b1728c34c31deb Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked @@ -6,10 +6,10 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8b3d92c..ee43bd7 100644 +index 121b3d5..fa3f5e0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1030,23 +1030,24 @@ public abstract class World implements IBlockAccess { +@@ -1120,23 +1120,24 @@ public abstract class World implements IBlockAccess { this.players.remove(entity); this.everyoneSleeping(); } diff --git a/CraftBukkit-Patches/0111-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0110-Cancellable-WitherSkull-potion-effect.patch similarity index 96% rename from CraftBukkit-Patches/0111-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0110-Cancellable-WitherSkull-potion-effect.patch index 801e32760d..58d569428b 100644 --- a/CraftBukkit-Patches/0111-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0110-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 7e3133d0b2e17bf86e80f55d9c43b267592a978a Mon Sep 17 00:00:00 2001 +From 79aa2f374c703826e1b7d059d2900ebb5683dc49 Mon Sep 17 00:00:00 2001 From: drXor Date: Tue, 25 Feb 2014 15:15:26 -0400 Subject: [PATCH] Cancellable WitherSkull potion effect diff --git a/CraftBukkit-Patches/0112-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0111-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 97% rename from CraftBukkit-Patches/0112-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0111-Descriptive-kick-reasons-instead-of-Nope.patch index e336ad500a..2e59ad1b92 100644 --- a/CraftBukkit-Patches/0112-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0111-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 78ae96c3f3e3eca5ab5e73ceb72854107eeb6552 Mon Sep 17 00:00:00 2001 +From 4d865bdc4f4b2e84c42c5f8d11da779a10b15776 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! diff --git a/CraftBukkit-Patches/0113-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0112-Check-for-manually-prefixed-commands-or-commands-tha.patch similarity index 95% rename from CraftBukkit-Patches/0113-Check-for-manually-prefixed-commands-or-commands-tha.patch rename to CraftBukkit-Patches/0112-Check-for-manually-prefixed-commands-or-commands-tha.patch index 28464dfbfb..f8b64d1c82 100644 --- a/CraftBukkit-Patches/0113-Check-for-manually-prefixed-commands-or-commands-tha.patch +++ b/CraftBukkit-Patches/0112-Check-for-manually-prefixed-commands-or-commands-tha.patch @@ -1,4 +1,4 @@ -From 6654ae053ee4372d4764a7c3c045ad9114b577a0 Mon Sep 17 00:00:00 2001 +From 967f8f3f3602a2218d7f0e0430360c1f1b2379bc Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 01:12:10 +0000 Subject: [PATCH] Check for manually prefixed commands or commands that don't diff --git a/CraftBukkit-Patches/0114-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0113-Cap-window-names-to-prevent-client-disconnects.patch similarity index 93% rename from CraftBukkit-Patches/0114-Cap-window-names-to-prevent-client-disconnects.patch rename to CraftBukkit-Patches/0113-Cap-window-names-to-prevent-client-disconnects.patch index 133aa7a597..1857a5f9ba 100644 --- a/CraftBukkit-Patches/0114-Cap-window-names-to-prevent-client-disconnects.patch +++ b/CraftBukkit-Patches/0113-Cap-window-names-to-prevent-client-disconnects.patch @@ -1,4 +1,4 @@ -From 63d9eeebbe7c6d6a288a6e601d3ebfd5650b65f3 Mon Sep 17 00:00:00 2001 +From 64124b6baf4bb7a6bb9d12cdc2d8a939df5f5b3e Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 23 Mar 2014 10:53:48 +0000 Subject: [PATCH] Cap window names to prevent client disconnects diff --git a/CraftBukkit-Patches/0115-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0114-Enable-Improved-Ping-Sending.patch similarity index 97% rename from CraftBukkit-Patches/0115-Enable-Improved-Ping-Sending.patch rename to CraftBukkit-Patches/0114-Enable-Improved-Ping-Sending.patch index 9cb5d23780..78050c05f7 100644 --- a/CraftBukkit-Patches/0115-Enable-Improved-Ping-Sending.patch +++ b/CraftBukkit-Patches/0114-Enable-Improved-Ping-Sending.patch @@ -1,4 +1,4 @@ -From 6a3edc587a7e2707a2dff6ac6a4659b1d5301844 Mon Sep 17 00:00:00 2001 +From 694229c193465042c95d90c33dd15b354ddae49d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved Ping Sending diff --git a/CraftBukkit-Patches/0116-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0115-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 98% rename from CraftBukkit-Patches/0116-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0115-Configurable-dragon-death-and-wither-spawn-sounds.patch index 04c8a2ffc8..be62fc5d24 100644 --- a/CraftBukkit-Patches/0116-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0115-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From cb6e4ceea5ca3b59de192cdb001484832ff2282e Mon Sep 17 00:00:00 2001 +From 51d0cf0c12b0705fa0252a3b144e405baf4e7a86 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/CraftBukkit-Patches/0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0116-Fix-TileEntities-getting-ticked-after-being-queued-f.patch similarity index 84% rename from CraftBukkit-Patches/0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch rename to CraftBukkit-Patches/0116-Fix-TileEntities-getting-ticked-after-being-queued-f.patch index 5cb427afd4..737ca2a63e 100644 --- a/CraftBukkit-Patches/0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch +++ b/CraftBukkit-Patches/0116-Fix-TileEntities-getting-ticked-after-being-queued-f.patch @@ -1,4 +1,4 @@ -From c104bf6c03a89946aba78481e78f33847246795f Mon Sep 17 00:00:00 2001 +From 4f24bb05650bebb0a4791103d0edaa51d4ed90c7 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 23 Mar 2014 01:49:13 +0100 Subject: [PATCH] Fix TileEntities getting ticked after being queued for @@ -6,10 +6,10 @@ Subject: [PATCH] Fix TileEntities getting ticked after being queued for diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ee43bd7..52ed625 100644 +index fa3f5e0..4ff8211 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1346,6 +1346,12 @@ public abstract class World implements IBlockAccess { +@@ -1436,6 +1436,12 @@ public abstract class World implements IBlockAccess { timings.entityTick.stopTiming(); // Spigot this.methodProfiler.c("blockEntities"); timings.tileEntityTick.startTiming(); // Spigot @@ -22,7 +22,7 @@ index ee43bd7..52ed625 100644 this.M = true; Iterator iterator = this.tileEntityList.iterator(); -@@ -1394,10 +1400,6 @@ public abstract class World implements IBlockAccess { +@@ -1484,10 +1490,6 @@ public abstract class World implements IBlockAccess { timings.tileEntityTick.stopTiming(); // Spigot timings.tileEntityPending.startTiming(); // Spigot this.M = false; diff --git a/CraftBukkit-Patches/0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0117-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 92% rename from CraftBukkit-Patches/0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0117-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 53bb2c0b51..063e754f40 100644 --- a/CraftBukkit-Patches/0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0117-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From 63bcb8d073906b41c60b2ae4ebfced2aa92cc887 Mon Sep 17 00:00:00 2001 +From c5f3488cc255f9ac1ec04bf69a73ad1609639c35 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/CraftBukkit-Patches/0119-Old-New-Version-Support.patch b/CraftBukkit-Patches/0118-Old-New-Version-Support.patch similarity index 99% rename from CraftBukkit-Patches/0119-Old-New-Version-Support.patch rename to CraftBukkit-Patches/0118-Old-New-Version-Support.patch index 18f9abd53e..ded73c234a 100644 --- a/CraftBukkit-Patches/0119-Old-New-Version-Support.patch +++ b/CraftBukkit-Patches/0118-Old-New-Version-Support.patch @@ -1,4 +1,4 @@ -From 1086a67b3b1c4096176d48238b6595b26053f1b1 Mon Sep 17 00:00:00 2001 +From 1542fc3959303de148140f1e32925083db1ee346 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 15:11:15 +1000 Subject: [PATCH] Old / New Version Support. diff --git a/CraftBukkit-Patches/0120-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0119-Treat-Bungee-as-Online-Mode.patch similarity index 94% rename from CraftBukkit-Patches/0120-Treat-Bungee-as-Online-Mode.patch rename to CraftBukkit-Patches/0119-Treat-Bungee-as-Online-Mode.patch index e381d6f021..7c9c10f9ba 100644 --- a/CraftBukkit-Patches/0120-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0119-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From 22fd5a35456d9aa916105f5d1e57e84aeef95c33 Mon Sep 17 00:00:00 2001 +From 8bc1c8631c896b2f644c4c1d33a35799b2e7b6ac Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:23:58 +1000 Subject: [PATCH] Treat Bungee as Online Mode diff --git a/CraftBukkit-Patches/0121-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0120-Fix-several-occurances-of-missed-diff.patch similarity index 98% rename from CraftBukkit-Patches/0121-Fix-several-occurances-of-missed-diff.patch rename to CraftBukkit-Patches/0120-Fix-several-occurances-of-missed-diff.patch index 4589c21a12..b2040a2ef5 100644 --- a/CraftBukkit-Patches/0121-Fix-several-occurances-of-missed-diff.patch +++ b/CraftBukkit-Patches/0120-Fix-several-occurances-of-missed-diff.patch @@ -1,4 +1,4 @@ -From 034be6d215f5e6f81e2beea636fc475e257d02a1 Mon Sep 17 00:00:00 2001 +From 05ee68a5268bc100a971c9120f1e2ae38aa31c71 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 17:49:14 +1000 Subject: [PATCH] Fix several occurances of missed diff. diff --git a/CraftBukkit-Patches/0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch b/CraftBukkit-Patches/0121-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch similarity index 97% rename from CraftBukkit-Patches/0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch rename to CraftBukkit-Patches/0121-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch index c1ade16437..edce8c88fe 100644 --- a/CraftBukkit-Patches/0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch +++ b/CraftBukkit-Patches/0121-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch @@ -1,4 +1,4 @@ -From 892606c5b33c7f52b15160d5be2efefc1f9010b0 Mon Sep 17 00:00:00 2001 +From 1656b1552966abb331afceb9168e2ffc1959e101 Mon Sep 17 00:00:00 2001 From: myiume Date: Wed, 19 Feb 2014 15:40:37 +0200 Subject: [PATCH] Fix PlayerFishEvent not properly cancelling. Fixes diff --git a/CraftBukkit-Patches/0123-Update-Warning.patch b/CraftBukkit-Patches/0122-Update-Warning.patch similarity index 97% rename from CraftBukkit-Patches/0123-Update-Warning.patch rename to CraftBukkit-Patches/0122-Update-Warning.patch index 9900c20f45..d9fb578744 100644 --- a/CraftBukkit-Patches/0123-Update-Warning.patch +++ b/CraftBukkit-Patches/0122-Update-Warning.patch @@ -1,4 +1,4 @@ -From dca8c73a51050b270239084f2d5c3ab896a6fa7a Mon Sep 17 00:00:00 2001 +From a72909ea34f09f3e84568ef4e75f86fc9570b3f7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:37:12 +1000 Subject: [PATCH] Update Warning diff --git a/CraftBukkit-Patches/0124-Add-Conversion-Message.patch b/CraftBukkit-Patches/0123-Add-Conversion-Message.patch similarity index 91% rename from CraftBukkit-Patches/0124-Add-Conversion-Message.patch rename to CraftBukkit-Patches/0123-Add-Conversion-Message.patch index 7f4a136032..22bc5d4cf1 100644 --- a/CraftBukkit-Patches/0124-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0123-Add-Conversion-Message.patch @@ -1,4 +1,4 @@ -From ccf1116617229ca6833047a852acd7afa7172653 Mon Sep 17 00:00:00 2001 +From 741919efc9f2593522022bfaa97734fa62e72d8d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 23:30:44 +1000 Subject: [PATCH] Add Conversion Message diff --git a/CraftBukkit-Patches/0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0124-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch similarity index 94% rename from CraftBukkit-Patches/0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch rename to CraftBukkit-Patches/0124-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index 9a926377fd..649cce1d80 100644 --- a/CraftBukkit-Patches/0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0124-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From 564531446a8a13eb3a3b575d6e149e2e92a822da Mon Sep 17 00:00:00 2001 +From d75e49afe86bfb6cbe02ff20bc3871e50185e263 Mon Sep 17 00:00:00 2001 From: "gjmcferrin@gmail.com" Date: Mon, 10 Feb 2014 10:05:11 -0500 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396 diff --git a/CraftBukkit-Patches/0126-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0125-Print-Stack-on-InternalException.patch similarity index 91% rename from CraftBukkit-Patches/0126-Print-Stack-on-InternalException.patch rename to CraftBukkit-Patches/0125-Print-Stack-on-InternalException.patch index ef2798cac8..f42fa9c712 100644 --- a/CraftBukkit-Patches/0126-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0125-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From e93dbc39f80b20a0df267e4c07a00edd7430dffd Mon Sep 17 00:00:00 2001 +From a0d6415612a3f7ed22bbc82fc6a7ae2e14a1ca63 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 09:00:59 +1000 Subject: [PATCH] Print Stack on InternalException diff --git a/CraftBukkit-Patches/0127-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0126-Use-Offline-Player-Data-Once-if-Required.patch similarity index 96% rename from CraftBukkit-Patches/0127-Use-Offline-Player-Data-Once-if-Required.patch rename to CraftBukkit-Patches/0126-Use-Offline-Player-Data-Once-if-Required.patch index 0b758b0ac6..d209cb4748 100644 --- a/CraftBukkit-Patches/0127-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0126-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 848ac7692c4eab0f25bf59333165ee86d7a3b12f Mon Sep 17 00:00:00 2001 +From 4a59045ce2abba675a931fc1c645a6bf8506dc9f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 14:41:23 +1000 Subject: [PATCH] Use Offline Player Data Once if Required. diff --git a/CraftBukkit-Patches/0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0127-Use-Provided-Case-for-Non-Existent-Offline-Players.patch similarity index 92% rename from CraftBukkit-Patches/0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch rename to CraftBukkit-Patches/0127-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index 1435cdf832..b60f531c6e 100644 --- a/CraftBukkit-Patches/0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0127-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,4 +1,4 @@ -From 4a8b0cc2b1371ace2eb003f12b43ab745b1b278c Mon Sep 17 00:00:00 2001 +From 12cbab037a9a6e8fdcb01842a5fe6710cc2d2e34 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 09:46:20 +1000 Subject: [PATCH] Use Provided Case for Non Existent Offline Players diff --git a/CraftBukkit-Patches/0129-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0128-Check-for-blank-OfflinePlayer-Names.patch similarity index 93% rename from CraftBukkit-Patches/0129-Check-for-blank-OfflinePlayer-Names.patch rename to CraftBukkit-Patches/0128-Check-for-blank-OfflinePlayer-Names.patch index e058e95ff2..26564a2442 100644 --- a/CraftBukkit-Patches/0129-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0128-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From 338ff1aad7e50605e5fdd61d8ad33a9aaa39fbf6 Mon Sep 17 00:00:00 2001 +From fc6524f58752a840951b5a9f220d0347006807ba Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 17:21:24 +1000 Subject: [PATCH] Check for blank OfflinePlayer Names diff --git a/CraftBukkit-Patches/0130-Fix-Player-Banning.patch b/CraftBukkit-Patches/0129-Fix-Player-Banning.patch similarity index 96% rename from CraftBukkit-Patches/0130-Fix-Player-Banning.patch rename to CraftBukkit-Patches/0129-Fix-Player-Banning.patch index b9a0eedf2e..a14954c1a8 100644 --- a/CraftBukkit-Patches/0130-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0129-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From a391e481f89e10e825bac6f9d24941ad2a3b056e Mon Sep 17 00:00:00 2001 +From 2a50cd4623119094130a0133120b351f37ce5188 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:32:48 +1000 Subject: [PATCH] Fix Player Banning diff --git a/CraftBukkit-Patches/0132-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0130-Fix-ban-expire-dates.patch similarity index 92% rename from CraftBukkit-Patches/0132-Fix-ban-expire-dates.patch rename to CraftBukkit-Patches/0130-Fix-ban-expire-dates.patch index 06d466cdbc..bea80af767 100644 --- a/CraftBukkit-Patches/0132-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0130-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From e3d1772ead39601b40ee9f6f566900d65ea7fe34 Mon Sep 17 00:00:00 2001 +From 7452d9cfab74a596456657f225f34954611cc16b Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 10:09:56 +1000 Subject: [PATCH] Fix ban expire dates. diff --git a/CraftBukkit-Patches/0133-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0131-Correct-Ban-Expiration.patch similarity index 93% rename from CraftBukkit-Patches/0133-Correct-Ban-Expiration.patch rename to CraftBukkit-Patches/0131-Correct-Ban-Expiration.patch index 5b0e8f067f..64637af216 100644 --- a/CraftBukkit-Patches/0133-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0131-Correct-Ban-Expiration.patch @@ -1,4 +1,4 @@ -From c8af809c84dad3bd49b6839ee7193a786d846db6 Mon Sep 17 00:00:00 2001 +From 476e839917717b4036d2482904033d28e7c2782a Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 11:14:38 +1000 Subject: [PATCH] Correct Ban Expiration diff --git a/CraftBukkit-Patches/0134-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0132-Convert-Horses-owner-to-UUID.patch similarity index 94% rename from CraftBukkit-Patches/0134-Convert-Horses-owner-to-UUID.patch rename to CraftBukkit-Patches/0132-Convert-Horses-owner-to-UUID.patch index 022e8ce08a..9afe1cf0bc 100644 --- a/CraftBukkit-Patches/0134-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0132-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From feba07303481bbdf7d344d1fbc4553b4be903392 Mon Sep 17 00:00:00 2001 +From 90a0b287ba00d8e3d17dc19e9c21e51ae01a03a3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 Apr 2014 01:40:30 -0400 Subject: [PATCH] Convert Horses owner to UUID diff --git a/CraftBukkit-Patches/0135-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0133-Expand-team-API-to-allow-arbitrary-strings.patch similarity index 98% rename from CraftBukkit-Patches/0135-Expand-team-API-to-allow-arbitrary-strings.patch rename to CraftBukkit-Patches/0133-Expand-team-API-to-allow-arbitrary-strings.patch index 0878b83729..dbe40b4cf1 100644 --- a/CraftBukkit-Patches/0135-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/CraftBukkit-Patches/0133-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From 0cf6625019f5b75706a7f51591deeb67e9f2a17c Mon Sep 17 00:00:00 2001 +From fed705bb9045b02db7f2c8b9304cca756d98c027 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:22:22 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/CraftBukkit-Patches/0136-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0134-Add-Score.isScoreSet-Z-API.patch similarity index 96% rename from CraftBukkit-Patches/0136-Add-Score.isScoreSet-Z-API.patch rename to CraftBukkit-Patches/0134-Add-Score.isScoreSet-Z-API.patch index 2de20cee96..ff577ff172 100644 --- a/CraftBukkit-Patches/0136-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0134-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From 963e83f965e56fd4083bce3238eeedb164e6625d Mon Sep 17 00:00:00 2001 +From e90495528c8e1825a76d06ff3c6a570dc0fec2f1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:53 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/CraftBukkit-Patches/0137-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0135-Log-null-TileEntity-Owner.patch similarity index 94% rename from CraftBukkit-Patches/0137-Log-null-TileEntity-Owner.patch rename to CraftBukkit-Patches/0135-Log-null-TileEntity-Owner.patch index f56fc8a417..ac3c99df62 100644 --- a/CraftBukkit-Patches/0137-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0135-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From 9cac662254b15d2ab59efa9e99a4a988be30e4f6 Mon Sep 17 00:00:00 2001 +From 4eb71b4d0c00aeb1321db3aa9d88802adfc6729b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 11:16:54 +1000 Subject: [PATCH] Log null TileEntity Owner diff --git a/CraftBukkit-Patches/0138-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch similarity index 96% rename from CraftBukkit-Patches/0138-Don-t-special-case-invalid-usernames-for-UUIDs.patch rename to CraftBukkit-Patches/0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch index c6ca430f85..eead4d9e50 100644 --- a/CraftBukkit-Patches/0138-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,4 +1,4 @@ -From d3c20f6bc5078698723d6f34d68bd3865c7e674c Mon Sep 17 00:00:00 2001 +From 5eace513ddcbb97a48d8f215ce3a49530cdbabae Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 18:58:00 +1000 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs. diff --git a/CraftBukkit-Patches/0139-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0137-Convert-player-skulls-async.patch similarity index 98% rename from CraftBukkit-Patches/0139-Convert-player-skulls-async.patch rename to CraftBukkit-Patches/0137-Convert-player-skulls-async.patch index 593c98ad81..05d682ebd6 100644 --- a/CraftBukkit-Patches/0139-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0137-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From fa5e5bc9da02923761b86b69e08eeabdb3581d20 Mon Sep 17 00:00:00 2001 +From d2cf3dd0f6af93ba451c822b98d12915cdd77490 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 20 Apr 2014 13:18:55 +0100 Subject: [PATCH] Convert player skulls async diff --git a/CraftBukkit-Patches/0140-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0138-Prevent-NoClassDefError-crash-and-notify-on-crash.patch similarity index 91% rename from CraftBukkit-Patches/0140-Prevent-NoClassDefError-crash-and-notify-on-crash.patch rename to CraftBukkit-Patches/0138-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index a044e532e1..189a804303 100644 --- a/CraftBukkit-Patches/0140-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0138-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,14 +1,14 @@ -From 7298686551958fd4fe66772a694ead9a01d956c5 Mon Sep 17 00:00:00 2001 +From 2dab006c4c4e19bf855cf834866b7a66c0c5c88c Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 52ed625..ff65035 100644 +index 4ff8211..3874fab 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -108,6 +108,8 @@ public abstract class World implements IBlockAccess { +@@ -111,6 +111,8 @@ public abstract class World implements IBlockAccess { protected float growthOdds = 100; protected float modifiedOdds = 100; private final byte chunkTickRadius; @@ -17,7 +17,7 @@ index 52ed625..ff65035 100644 public static long chunkToKey(int x, int z) { -@@ -531,6 +533,9 @@ public abstract class World implements IBlockAccess { +@@ -621,6 +623,9 @@ public abstract class World implements IBlockAccess { // CraftBukkit end block1.doPhysics(this, i, j, k, block); diff --git a/CraftBukkit-Patches/0131-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0139-Check-Skull-canPlace.patch similarity index 55% rename from CraftBukkit-Patches/0131-Check-Skull-canPlace.patch rename to CraftBukkit-Patches/0139-Check-Skull-canPlace.patch index 825abf5cdc..ff22a1cb88 100644 --- a/CraftBukkit-Patches/0131-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0139-Check-Skull-canPlace.patch @@ -1,26 +1,26 @@ -From dfe20c18163c5048564dd93153f1100fb98ac9ee Mon Sep 17 00:00:00 2001 +From e6f4942654a0976d162e95a63d0b237980873bdb Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:48:35 +1000 Subject: [PATCH] Check Skull canPlace diff --git a/src/main/java/net/minecraft/server/ItemSkull.java b/src/main/java/net/minecraft/server/ItemSkull.java -index dd7e5cc..49346a6 100644 +index f20c69e..15c60bb 100644 --- a/src/main/java/net/minecraft/server/ItemSkull.java +++ b/src/main/java/net/minecraft/server/ItemSkull.java -@@ -45,6 +45,12 @@ public class ItemSkull extends Item { +@@ -42,6 +42,12 @@ public class ItemSkull extends Item { + } + if (!world.isStatic) { - // CraftBukkit start - Handle in ItemBlock - // world.setTypeAndData(i, j, k, Blocks.SKULL, l, 2); + // Spigot Start + if ( !Blocks.SKULL.canPlace( world, i, j, k ) ) + { + return false; + } + // Spigot End - if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, Blocks.SKULL, l, clickedX, clickedY, clickedZ)) { - return false; - } + world.setTypeAndData(i, j, k, Blocks.SKULL, l, 2); + int i1 = 0; + -- 1.9.1 diff --git a/CraftBukkit-Patches/0089-Don-t-let-trees-replace-any-block-when-growing.patch b/CraftBukkit-Patches/0140-Don-t-let-trees-replace-any-block.patch similarity index 80% rename from CraftBukkit-Patches/0089-Don-t-let-trees-replace-any-block-when-growing.patch rename to CraftBukkit-Patches/0140-Don-t-let-trees-replace-any-block.patch index 321cbbd529..c931e1cb69 100644 --- a/CraftBukkit-Patches/0089-Don-t-let-trees-replace-any-block-when-growing.patch +++ b/CraftBukkit-Patches/0140-Don-t-let-trees-replace-any-block.patch @@ -1,14 +1,14 @@ -From 36e1317ec3b5e31ade6b2e54dc4d305b6ee7bf52 Mon Sep 17 00:00:00 2001 +From df36bc3caccde18ea3af8538283e536f110d7054 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 20 Jan 2014 20:42:28 +0000 -Subject: [PATCH] Don't let trees replace any block when growing +Subject: [PATCH] Don't let trees replace any block. diff --git a/src/main/java/net/minecraft/server/WorldGenForestTree.java b/src/main/java/net/minecraft/server/WorldGenForestTree.java -index 71ce973..caaac9a 100644 +index 63c5af6..a758179 100644 --- a/src/main/java/net/minecraft/server/WorldGenForestTree.java +++ b/src/main/java/net/minecraft/server/WorldGenForestTree.java -@@ -132,7 +132,12 @@ public class WorldGenForestTree extends WorldGenTreeAbstract implements BlockSap +@@ -124,7 +124,12 @@ public class WorldGenForestTree extends WorldGenTreeAbstract { int k3; for (k3 = 0; k3 < j3; ++k3) { diff --git a/CraftBukkit-Patches/0141-Stop-anvils-from-destroying-all-items-in-the-second-.patch b/CraftBukkit-Patches/0141-Stop-anvils-from-destroying-all-items-in-the-second-.patch deleted file mode 100644 index 83a2815144..0000000000 --- a/CraftBukkit-Patches/0141-Stop-anvils-from-destroying-all-items-in-the-second-.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 7847557ebc8cf54f1f66fbe027ecf2e0ab9a4c74 Mon Sep 17 00:00:00 2001 -From: David -Date: Wed, 23 Apr 2014 01:01:47 +0100 -Subject: [PATCH] Stop anvils from destroying all items in the second slot - -While this may allow multiple stacked items to be repaired at once, it's better than eating all of a user's items. - -diff --git a/src/main/java/net/minecraft/server/ContainerAnvilInventory.java b/src/main/java/net/minecraft/server/ContainerAnvilInventory.java -index 1afa6e7..d975b44 100644 ---- a/src/main/java/net/minecraft/server/ContainerAnvilInventory.java -+++ b/src/main/java/net/minecraft/server/ContainerAnvilInventory.java -@@ -43,7 +43,7 @@ public class ContainerAnvilInventory extends InventorySubcontainer { // CraftBuk - ContainerAnvilInventory(ContainerAnvil containeranvil, String s, boolean flag, int i) { - super(s, flag, i); - this.a = containeranvil; -- this.setMaxStackSize(1); // CraftBukkit -+ // Spigot - Removed this.setMaxStackSize(1); // CraftBukkit - } - - // CraftBukkit start - override inherited maxStack from InventorySubcontainer --- -1.9.1 -