diff --git a/Spigot-API-Patches/0044-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0044-Add-ProjectileCollideEvent.patch new file mode 100644 index 0000000000..14dd889412 --- /dev/null +++ b/Spigot-API-Patches/0044-Add-ProjectileCollideEvent.patch @@ -0,0 +1,77 @@ +From 40cc96eda623cddf95322ad4ca1d0ae665625ba1 Mon Sep 17 00:00:00 2001 +From: Techcable +Date: Fri, 16 Dec 2016 21:25:39 -0600 +Subject: [PATCH] Add ProjectileCollideEvent + + +diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java +new file mode 100644 +index 0000000..f42e985 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java +@@ -0,0 +1,62 @@ ++package com.destroystokyo.paper.event.entity; ++ ++import org.bukkit.entity.Entity; ++import org.bukkit.entity.Projectile; ++import org.bukkit.event.Cancellable; ++import org.bukkit.event.HandlerList; ++import org.bukkit.event.entity.EntityEvent; ++ ++/** ++ * Called when an projectile collides with an entity ++ *

++ * This event is called before {@link org.bukkit.event.entity.EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying ++ */ ++public class ProjectileCollideEvent extends EntityEvent implements Cancellable { ++ private final Entity collidedWith; ++ ++ /** ++ * Get the entity the projectile collided with ++ * ++ * @return the entity collided with ++ */ ++ public Entity getCollidedWith() { ++ return collidedWith; ++ } ++ ++ public ProjectileCollideEvent(Projectile what, Entity collidedWith) { ++ super(what); ++ this.collidedWith = collidedWith; ++ } ++ ++ /** ++ * Get the projectile that collided ++ * ++ * @return the projectile that collided ++ */ ++ public Projectile getEntity() { ++ return (Projectile) super.getEntity(); ++ } ++ ++ private static final HandlerList handlerList = new HandlerList(); ++ ++ public static HandlerList getHandlerList() { ++ return handlerList; ++ } ++ ++ @Override ++ public HandlerList getHandlers() { ++ return handlerList; ++ } ++ ++ private boolean cancelled = false; ++ ++ @Override ++ public boolean isCancelled() { ++ return cancelled; ++ } ++ ++ @Override ++ public void setCancelled(boolean cancel) { ++ this.cancelled = cancel; ++ } ++} +-- +2.9.3 + diff --git a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch similarity index 96% rename from Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch rename to Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch index 32fb5a7ae8..ba03036198 100644 --- a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch +++ b/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch @@ -1,4 +1,4 @@ -From e460bd961a9d020f64b2e0cb59b9e0991e1361e9 Mon Sep 17 00:00:00 2001 +From ba20e837e38f468c105978d3289fe3c5b31fdea8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 12:45:11 -0600 Subject: [PATCH] Configurable squid spawn ranges @@ -35,5 +35,5 @@ index 9f88e44..56f7ca8 100644 public void b(float f, float f1, float f2) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch deleted file mode 100644 index a8ed85a672..0000000000 --- a/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch +++ /dev/null @@ -1,99 +0,0 @@ -From c41f57a6a44ef40c5010c2fadaa6e583183c7995 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Mon, 29 Feb 2016 21:20:21 -0600 -Subject: [PATCH] Vanished players don't have rights - - -diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index ca84d92..287566c 100644 ---- a/src/main/java/net/minecraft/server/EntityArrow.java -+++ b/src/main/java/net/minecraft/server/EntityArrow.java -@@ -190,6 +190,14 @@ public abstract class EntityArrow extends Entity implements IProjectile { - } - } - -+ // Paper start - Allow arrows to fly through vanished players the shooter can't see -+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) { -+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) { -+ movingobjectposition = null; -+ } -+ } -+ // Paper end -+ - if (movingobjectposition != null) { - this.a(movingobjectposition); - } -diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index bfbae25..c8837be 100644 ---- a/src/main/java/net/minecraft/server/EntityFishingHook.java -+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -224,6 +224,15 @@ public class EntityFishingHook extends Entity { - - vec3d = new Vec3D(this.locX, this.locY, this.locZ); - vec3d1 = new Vec3D(this.locX + this.motX, this.locY + this.motY, this.locZ + this.motZ); -+ -+ // Paper start - Allow fishing hooks to fly through vanished players the shooter can't see -+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && owner != null && owner instanceof EntityPlayer) { -+ if (!((EntityPlayer) owner).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) { -+ movingobjectposition = null; -+ } -+ } -+ // Paper end -+ - if (movingobjectposition != null) { - vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z); - } -diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 40ac335..3d5548f 100644 ---- a/src/main/java/net/minecraft/server/EntityProjectile.java -+++ b/src/main/java/net/minecraft/server/EntityProjectile.java -@@ -160,6 +160,14 @@ public abstract class EntityProjectile extends Entity implements IProjectile { - movingobjectposition = new MovingObjectPosition(entity); - } - -+ // Paper start - Allow projectiles to fly through vanished players the shooter can't see -+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) { -+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) { -+ movingobjectposition = null; -+ } -+ } -+ // Paper end -+ - if (movingobjectposition != null) { - if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) { - this.e(movingobjectposition.a()); -diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index eb32871..58ec8b5 100644 ---- a/src/main/java/net/minecraft/server/ItemBlock.java -+++ b/src/main/java/net/minecraft/server/ItemBlock.java -@@ -20,7 +20,7 @@ public class ItemBlock extends Item { - - ItemStack itemstack = entityhuman.b(enumhand); - -- if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, (Entity) null)) { -+ if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, entityhuman)) { // Paper - Pass entityhuman instead of null - int i = this.filterData(itemstack.getData()); - IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); - -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 78b5a3c..2a38b1c 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -1725,6 +1725,14 @@ public abstract class World implements IBlockAccess { - for (int i = 0; i < list.size(); ++i) { - Entity entity1 = (Entity) list.get(i); - -+ // Paper start - Allow block placement if the placer cannot see the vanished blocker -+ if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) { -+ if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) { -+ continue; -+ } -+ } -+ // Paper end -+ - if (!entity1.dead && entity1.i && entity1 != entity && (entity == null || entity1.x(entity))) { - return false; - } --- -2.10.2.windows.1 - diff --git a/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch similarity index 94% rename from Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch rename to Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch index 6bb1240714..f6550b4df5 100644 --- a/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,4 +1,4 @@ -From 4247f8b4fd518e49f1bb0e6a22a2a3c1bd4aed29 Mon Sep 17 00:00:00 2001 +From fb33837750d4fdd9577d1baea535a594d1b3e899 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:02:51 -0600 Subject: [PATCH] Configurable cactus and reed natural growth heights @@ -23,7 +23,7 @@ index c74c8a7..8d9c322 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index 4368731..fec2f0a 100644 +index 3f579fb..a69a707 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -28,7 +28,7 @@ public class BlockCactus extends Block { @@ -36,7 +36,7 @@ index 4368731..fec2f0a 100644 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 4bb63ff..2e565d3 100644 +index 84014b1..9d1af2a 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -28,7 +28,7 @@ public class BlockReed extends Block { @@ -49,5 +49,5 @@ index 4bb63ff..2e565d3 100644 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot -- -2.8.3 +2.9.3 diff --git a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch similarity index 97% rename from Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch rename to Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch index 6606143e3b..ce743eafb9 100644 --- a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch @@ -1,4 +1,4 @@ -From 4913d3438af4ad594d6c8022d5e343ec0f03bcc7 Mon Sep 17 00:00:00 2001 +From 9f388589db8284372e23b471d7139f5321c51970 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:09:16 -0600 Subject: [PATCH] Configurable baby zombie movement speed @@ -45,5 +45,5 @@ index 497d559..897882c 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch similarity index 91% rename from Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch rename to Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch index 3dc58a31ad..cf5b09f305 100644 --- a/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch @@ -1,4 +1,4 @@ -From d1e7170b9d3d73895ed986db6751a0897443c488 Mon Sep 17 00:00:00 2001 +From 468154ec473f5c5111620f0c68e1f3ea8076128b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:14:11 -0600 Subject: [PATCH] Configurable fishing time ranges @@ -22,10 +22,10 @@ index ae3d0e4..7b2b95d 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 91702f2..e0475ce 100644 +index 0eb6207..96c3d66 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java -@@ -380,7 +380,7 @@ public class EntityFishingHook extends Entity { +@@ -371,7 +371,7 @@ public class EntityFishingHook extends Entity { this.at = MathHelper.nextInt(this.random, 20, 80); } } else { @@ -35,5 +35,5 @@ index 91702f2..e0475ce 100644 } } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch similarity index 97% rename from Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch rename to Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch index 01521efbfa..38d688fbc0 100644 --- a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch @@ -1,4 +1,4 @@ -From 910207ffbebc1c4e2b75815e1be168f7379a0233 Mon Sep 17 00:00:00 2001 +From 6234b90aa3d52cd7c4fb7d32e32a6513bb871040 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump @@ -57,5 +57,5 @@ index e3b4058..c16ad2c 100644 ((Navigation) entityinsentient.getNavigation()).c(true); } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 97% rename from Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch rename to Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch index 3b29ad2f14..15f7cd6c0c 100644 --- a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From c44fba6cdb89433a896e92ea32ab56a25ab58a20 Mon Sep 17 00:00:00 2001 +From 9f15156e130d9728cb00e3e9960e6a5282b1e334 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 1 Mar 2016 13:51:54 -0600 Subject: [PATCH] Add configurable despawn distances for living entities @@ -51,5 +51,5 @@ index 50b29c0..3f7eae1 100644 } } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch rename to Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch index 1f3225b642..ed828bd445 100644 --- a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch @@ -1,4 +1,4 @@ -From c445404785a2d57072675ac79855742923a32331 Mon Sep 17 00:00:00 2001 +From 25c9e1be46572bac02d6ab4726a60d5e9948d3bc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 03:53:43 -0600 Subject: [PATCH] Allow for toggling of spawn chunks @@ -20,7 +20,7 @@ index 92f38a4..c2c488a 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2a38b1c..52171a3 100644 +index 78b5a3c..69aeaca 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess { @@ -32,5 +32,5 @@ index 2a38b1c..52171a3 100644 this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 97% rename from Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch index d7c6d63524..7cf0626080 100644 --- a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,4 +1,4 @@ -From 93b9b2bae96d5f54b99cfd0765ec3ce98b413cbd Mon Sep 17 00:00:00 2001 +From 3de36042c25fa09c19415aa1690d56c108edd328 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height @@ -63,5 +63,5 @@ index 0fbdbd6..fd07356 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch similarity index 94% rename from Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch index 48d3d4c365..f1ddce24d2 100644 --- a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,11 +1,11 @@ -From 1c5ada35bc900cbdd76d751faa0fb1fdeec7a7fd Mon Sep 17 00:00:00 2001 +From 27e763ca619d7797d124edb43955e8c424c23ba7 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:27:13 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d44fdaea6..06d152762 100644 +index d44fdae..06d1527 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -137,4 +137,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index d44fdaea6..06d152762 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index c9294a58d..f4ac7bafa 100644 +index c9294a5..f4ac7ba 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids { @@ -57,5 +57,5 @@ index c9294a58d..f4ac7bafa 100644 + } } -- -2.11.0.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 97% rename from Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 654cd03903..8dbfd22286 100644 --- a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 3059ae61c794fce3c54797e2ac440bf78765a779 Mon Sep 17 00:00:00 2001 +From cb75f26bfce777e1f28853aa91d6230531242425 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -33,7 +33,7 @@ index 81a69e8..c8c6959 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0ddbd2f..9113be9 100644 +index 761c8e4..3f13c86 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -134,7 +134,7 @@ import net.md_5.bungee.api.chat.BaseComponent; @@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644 log.log( Level.SEVERE, "------------------------------" ); // -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch similarity index 96% rename from Spigot-Server-Patches/0017-Player-affects-spawning-API.patch rename to Spigot-Server-Patches/0016-Player-affects-spawning-API.patch index c8923ff5f7..47d5f9f368 100644 --- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 8511153bd8600f68521b299b00e1ce03e1d6992b Mon Sep 17 00:00:00 2001 +From 4f369a29323103c01bc354522f86e0a7b13ef229 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -57,10 +57,10 @@ index bec25e4..30aacc9 100644 j = MathHelper.floor(entityhuman.locZ / 16.0D); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 52171a3..3d70c50 100644 +index 69aeaca..c8ba375 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2750,7 +2750,7 @@ public abstract class World implements IBlockAccess { +@@ -2742,7 +2742,7 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); diff --git a/Spigot-Server-Patches/0018-Metrics.patch b/Spigot-Server-Patches/0017-Metrics.patch similarity index 93% rename from Spigot-Server-Patches/0018-Metrics.patch rename to Spigot-Server-Patches/0017-Metrics.patch index abd62339c3..e6a7c8ed31 100644 --- a/Spigot-Server-Patches/0018-Metrics.patch +++ b/Spigot-Server-Patches/0017-Metrics.patch @@ -1,4 +1,4 @@ -From 1764a472a3a6830464ebe4136e6c8ebb9b3b4b1f Mon Sep 17 00:00:00 2001 +From ee38e5a5f229f8adad1383883452f365de3e1b6b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:54:32 -0600 Subject: [PATCH] Metrics @@ -18,5 +18,5 @@ index a5fd59d..680283c 100644 String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"; String serverVersion = Bukkit.getVersion(); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch similarity index 94% rename from Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch rename to Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch index f3484170a1..9de6c6f77b 100644 --- a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,4 +1,4 @@ -From 6fa172fd0c691f25c4f2bde7223513232b35ab32 Mon Sep 17 00:00:00 2001 +From 6b1a51ebeb36d4d5f2b9e0a8816a4d7b3a7ddc02 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 15:08:03 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities @@ -20,5 +20,5 @@ index bd3b160..1c0108e 100644 System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ() + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!"); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch similarity index 99% rename from Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch rename to Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch index 42d1ee75c7..23f54fa397 100644 --- a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From f2bbe33ed075142f13f0c6d51b67f5e2d62f7a31 Mon Sep 17 00:00:00 2001 +From 801f5693fe5379447940a29868132cd8f973ece1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 22:01:19 -0600 Subject: [PATCH] Optimize TileEntity Ticking @@ -186,5 +186,5 @@ index 3d61c2d..586ceaa 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch similarity index 98% rename from Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch rename to Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch index b705e5fd57..ada0529d2f 100644 --- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 98a06688336bb1b699ef02030dd393fff7fe597f Mon Sep 17 00:00:00 2001 +From 1381fa6bedb54329d4d3206c466ce6dfe42c8c17 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -148,7 +148,7 @@ index c8c6959..127d11c 100644 } lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9113be9..c1149a6 100644 +index 3f13c86..7e7be86 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1726,6 +1726,17 @@ public final class CraftServer implements Server { @@ -211,5 +211,5 @@ index be2e31d..6d21c32 100644 return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch similarity index 91% rename from Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch rename to Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch index 4b653e781f..9d95de3b1d 100644 --- a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch @@ -1,11 +1,11 @@ -From fcbd429b4f06aa4a99c8fd9725b460cc8562b26c Mon Sep 17 00:00:00 2001 +From 33fa09857751646136abb45542df2edc1238be2a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 54542ee..a9c2677 100644 +index 5e9834c..3e4e080 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1173,12 +1173,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -24,5 +24,5 @@ index 54542ee..a9c2677 100644 @Override -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch similarity index 93% rename from Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch rename to Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch index e9cbaff00b..dbb8ff4426 100644 --- a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch @@ -1,11 +1,11 @@ -From f9f10699b2f5fcd38c9160971515c6cf5f093db7 Mon Sep 17 00:00:00 2001 +From 38018a4a5db0023a7d170ac687428d5549785ae4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:19:01 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9a2e9b2..cc15a0b 100644 +index a15c129..110f655 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -127,6 +127,26 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0024-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch similarity index 98% rename from Spigot-Server-Patches/0024-Entity-Origin-API.patch rename to Spigot-Server-Patches/0023-Entity-Origin-API.patch index 8652e76fae..cd5c9134b6 100644 --- a/Spigot-Server-Patches/0024-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From cb0c2ac1cdfc0d75128d4db894e6bf600a8ff0e9 Mon Sep 17 00:00:00 2001 +From 11ba8a856ee1d222a3012b43949ac3e3d15a39f0 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API @@ -89,7 +89,7 @@ index fd07356..25e471d 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3d70c50..eb0483d 100644 +index c8ba375..e73c9fb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess { @@ -155,5 +155,5 @@ index c493c9c..93843aa 100644 + // Paper end } -- -2.10.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch similarity index 97% rename from Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch rename to Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch index 2024603d25..cde423cdca 100644 --- a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch @@ -1,4 +1,4 @@ -From 7fbd0b2351a7a6e38cf85611cbcb5caa1fc5cbf0 Mon Sep 17 00:00:00 2001 +From c594cd00dc7576bf63dab6979473d31ae5b5eb98 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:52:34 -0600 Subject: [PATCH] Prevent tile entity and entity crashes @@ -23,7 +23,7 @@ index 0f505ed..1f3e89b 100644 public String a() throws Exception { int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4db969b..20cc5ff 100644 +index e73c9fb..804b994 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1467,10 +1467,12 @@ public abstract class World implements IBlockAccess { @@ -62,5 +62,5 @@ index 4db969b..20cc5ff 100644 // Spigot start finally { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch similarity index 97% rename from Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch rename to Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch index 12eceab3e8..25119eb829 100644 --- a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch @@ -1,4 +1,4 @@ -From 94a01cae0a4766334b1efdb05a4410a02a84a401 Mon Sep 17 00:00:00 2001 +From 5b6b3194d535a25d2f22da2bef56abe47f10bcca Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage @@ -87,5 +87,5 @@ index fdacb6d..ec75bab 100644 int i; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 93% rename from Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch rename to Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch index 1ccebb764f..8d95de7d4a 100644 --- a/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,4 +1,4 @@ -From 44c07ef0621492638973ef6e53b42a04e87c7bee Mon Sep 17 00:00:00 2001 +From 026b5acef75a274fa06375125444e828c071d629 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:03:55 -0600 Subject: [PATCH] Check online mode before converting and renaming player data @@ -18,5 +18,5 @@ index b6cb918..7c4c599 100644 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch similarity index 94% rename from Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch rename to Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch index 816b99d525..5f0869b2d2 100644 --- a/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch @@ -1,4 +1,4 @@ -From 2a837acc0906c9c21810efbe5aa68b66d4866d3a Mon Sep 17 00:00:00 2001 +From 84877410582d951108695a4d3d1d1951645022bb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:32:25 -0600 Subject: [PATCH] Always tick falling blocks @@ -25,5 +25,5 @@ index 5c2fb00..c411ce8 100644 || entity instanceof EntityFireworks ) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0029-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch similarity index 98% rename from Spigot-Server-Patches/0029-Lighting-Queue.patch rename to Spigot-Server-Patches/0028-Lighting-Queue.patch index 6ac49c31d3..d520d330c7 100644 --- a/Spigot-Server-Patches/0029-Lighting-Queue.patch +++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch @@ -1,4 +1,4 @@ -From de8891c221aadfd9a15b896d964d0d41367c5c44 Mon Sep 17 00:00:00 2001 +From 30eb1836f00bc0acb416356296137ec1881a4c09 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 00:52:31 -0600 Subject: [PATCH] Lighting Queue @@ -222,7 +222,7 @@ index 0000000..2350fe3 + } +} diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 20cc5ff..abe11ad 100644 +index 804b994..8cb3a98 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -387,7 +387,7 @@ public abstract class World implements IBlockAccess { @@ -235,5 +235,5 @@ index 20cc5ff..abe11ad 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch similarity index 95% rename from Spigot-Server-Patches/0030-Configurable-end-credits.patch rename to Spigot-Server-Patches/0029-Configurable-end-credits.patch index e5d540c179..bb81fad832 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From ee64101f6764c9f72a0c602568c0a27a872adeae Mon Sep 17 00:00:00 2001 +From c0b4ee8d6319a0fa582a082b881713ff96d27b2b Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits @@ -20,7 +20,7 @@ index f7a0c18..31503e7 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 29e33da..a400062 100644 +index 5b88b7a..ca9e94a 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -495,6 +495,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -52,5 +52,5 @@ index 29e33da..a400062 100644 } else { this.b((Statistic) AchievementList.D); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 95% rename from Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch rename to Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch index 34b19e2d99..d17ccf8e16 100644 --- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,4 +1,4 @@ -From f20f61e14a0f0ce21e1f6a4dafe533125e40bf0d Mon Sep 17 00:00:00 2001 +From 9878ca9652f24a660397d7e2291279a86ef7b54d Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities @@ -25,5 +25,5 @@ index 904bee8..4e05bcd 100644 for (int l1 = 0; l1 < list.size(); ++l1) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0032-Generator-Settings.patch b/Spigot-Server-Patches/0031-Generator-Settings.patch similarity index 99% rename from Spigot-Server-Patches/0032-Generator-Settings.patch rename to Spigot-Server-Patches/0031-Generator-Settings.patch index d7f4d2858e..e6c1185609 100644 --- a/Spigot-Server-Patches/0032-Generator-Settings.patch +++ b/Spigot-Server-Patches/0031-Generator-Settings.patch @@ -1,4 +1,4 @@ -From 19f118c6124003316d9f50b1a2f08e90d0b72a8f Mon Sep 17 00:00:00 2001 +From 8013611ea29f78ed2c393408a88e2cf1486b9658 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings @@ -265,5 +265,5 @@ index fb350c4..9c1605b 100644 ObjectIterator objectiterator = this.c.values().iterator(); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0033-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch similarity index 98% rename from Spigot-Server-Patches/0033-Optimize-explosions.patch rename to Spigot-Server-Patches/0032-Optimize-explosions.patch index fd75c010b7..f1c7389106 100644 --- a/Spigot-Server-Patches/0033-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From 28e05719f8e0a3f399db8c129b780df4fc2984e7 Mon Sep 17 00:00:00 2001 +From 8ac419a52c439df5879646d8ff7019006015ffba Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -136,7 +136,7 @@ index 2e72b8c..a872e76 100644 // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index abe11ad..1248a9f 100644 +index 8cb3a98..b80282b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -15,6 +15,7 @@ import javax.annotation.Nullable; @@ -156,5 +156,5 @@ index abe11ad..1248a9f 100644 public CraftWorld getWorld() { return this.world; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch similarity index 88% rename from Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch rename to Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch index 2533fe95dd..dcec872cca 100644 --- a/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch +++ b/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch @@ -1,11 +1,11 @@ -From f1c57d4b59b8184c15bd0162c9c69b503077b55a Mon Sep 17 00:00:00 2001 +From b0f886b09b2d945d228d9929ad9483d9804423f2 Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 12:03:23 -0600 Subject: [PATCH] Stop updating flowing block if material has changed diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index f4ac7bafa..801b9cb7b 100644 +index f4ac7ba..801b9cb 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -90,6 +90,7 @@ public class BlockFlowing extends BlockFluids { @@ -17,5 +17,5 @@ index f4ac7bafa..801b9cb7b 100644 IBlockData iblockdata2 = world.getType(blockposition.down()); -- -2.11.0.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0035-Fast-draining.patch b/Spigot-Server-Patches/0034-Fast-draining.patch similarity index 97% rename from Spigot-Server-Patches/0035-Fast-draining.patch rename to Spigot-Server-Patches/0034-Fast-draining.patch index fd4f8a7e34..09b73db777 100644 --- a/Spigot-Server-Patches/0035-Fast-draining.patch +++ b/Spigot-Server-Patches/0034-Fast-draining.patch @@ -1,11 +1,11 @@ -From ec2f189973a97ab5ac70fe2faf183e8ee14bdc8f Mon Sep 17 00:00:00 2001 +From 744980948a797748c01bbcaba313f3df560719bc Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 12:20:52 -0600 Subject: [PATCH] Fast draining diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 356265e91..2ec50685c 100644 +index 356265e..2ec5068 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -191,4 +191,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 356265e91..2ec50685c 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 801b9cb7b..8e9de3bcb 100644 +index 801b9cb..8e9de3b 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -69,7 +69,7 @@ public class BlockFlowing extends BlockFluids { @@ -109,5 +109,5 @@ index 801b9cb7b..8e9de3bcb 100644 + // Paper end } -- -2.11.0.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch similarity index 92% rename from Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch rename to Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch index bfbbd65d42..d64cd329f3 100644 --- a/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch +++ b/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch @@ -1,11 +1,11 @@ -From f160baf867681c46bfa3a01220c0add48fbff2e2 Mon Sep 17 00:00:00 2001 +From 9a7b96b67c61f7efed2231b2ac695b71fd28116f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 12:27:07 -0600 Subject: [PATCH] Configurable lava flow speed diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2ec50685c..b5a106d5b 100644 +index 2ec5068..b5a106d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -198,4 +198,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 2ec50685c..b5a106d5b 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 8e9de3bcb..765a37160 100644 +index 8e9de3b..765a371 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids { @@ -35,5 +35,5 @@ index 8e9de3bcb..765a37160 100644 world.getType(blockposition.north(1)).getBlock().material == Material.LAVA || world.getType(blockposition.south(1)).getBlock().material == Material.LAVA || -- -2.11.0.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch similarity index 99% rename from Spigot-Server-Patches/0037-Add-player-view-distance-API.patch rename to Spigot-Server-Patches/0036-Add-player-view-distance-API.patch index dd1dad1647..217fff1035 100644 --- a/Spigot-Server-Patches/0037-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch @@ -1,4 +1,4 @@ -From 4674b438eaca643fc5ced705ce51804c45410d52 Mon Sep 17 00:00:00 2001 +From 16e9f633d0e8dfafc9ae804697b3b18e12312aec Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API diff --git a/Spigot-Server-Patches/0038-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch similarity index 97% rename from Spigot-Server-Patches/0038-Disable-explosion-knockback.patch rename to Spigot-Server-Patches/0037-Disable-explosion-knockback.patch index 00d7a11ec2..59e1542a55 100644 --- a/Spigot-Server-Patches/0038-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch @@ -1,4 +1,4 @@ -From ea9f6345fab166ab7678c9e5212b78f2fc18618d Mon Sep 17 00:00:00 2001 +From 7d1dd59d14b025644570acfcdca2a484ab8b1c6a Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback @@ -19,7 +19,7 @@ index b5a106d..fcbf8a2 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3267357..87a8a3e 100644 +index b328b25..fe6fe3f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -892,12 +892,14 @@ public abstract class EntityLiving extends Entity { @@ -69,5 +69,5 @@ index 49fc95e..d7bc6a0 100644 } } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0039-Disable-thunder.patch b/Spigot-Server-Patches/0038-Disable-thunder.patch similarity index 93% rename from Spigot-Server-Patches/0039-Disable-thunder.patch rename to Spigot-Server-Patches/0038-Disable-thunder.patch index fbe1ea90e9..b74d4e432f 100644 --- a/Spigot-Server-Patches/0039-Disable-thunder.patch +++ b/Spigot-Server-Patches/0038-Disable-thunder.patch @@ -1,4 +1,4 @@ -From 6ca8b0e340f4ec99543cf6b3f700bb290f49d05c Mon Sep 17 00:00:00 2001 +From b5b06750f1956bfa1a74efeaa6f68bcc0e0b26b5 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -19,7 +19,7 @@ index fcbf8a2..b52e5c5 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6afcf7c..ca74db6 100644 +index 2817191..c4f0e68 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -427,7 +427,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -33,5 +33,5 @@ index 6afcf7c..ca74db6 100644 l = this.l >> 2; blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0040-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch similarity index 93% rename from Spigot-Server-Patches/0040-Disable-ice-and-snow.patch rename to Spigot-Server-Patches/0039-Disable-ice-and-snow.patch index af53a50624..8f8b5eed66 100644 --- a/Spigot-Server-Patches/0040-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch @@ -1,4 +1,4 @@ -From b8fb8297e40abe3791a77426cbdb2a690e39801b Mon Sep 17 00:00:00 2001 +From 524b919f7729b5f39111e2ff26f2aab3c43e46c3 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -19,7 +19,7 @@ index b52e5c5..a6afdd3 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ca74db6..c84121c 100644 +index c4f0e68..52b70e7 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -450,7 +450,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -32,5 +32,5 @@ index ca74db6..c84121c 100644 l = this.l >> 2; blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch similarity index 97% rename from Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch rename to Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch index 7db15a9cf0..e927756bea 100644 --- a/Spigot-Server-Patches/0041-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch @@ -1,4 +1,4 @@ -From d83f4a1d0a54a8c3e7c06b042e8bd56899562124 Mon Sep 17 00:00:00 2001 +From 06a5cb408921635efb8416880126f0bc0c7e1233 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 15:03:53 -0600 Subject: [PATCH] Configurable mob spawner tick rate @@ -64,5 +64,5 @@ index 5b41955..e523267 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch similarity index 98% rename from Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch rename to Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch index 0b3626790c..a40346a90a 100644 --- a/Spigot-Server-Patches/0042-Send-absolute-position-the-first-time-an-entity-is-s.patch +++ b/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch @@ -1,4 +1,4 @@ -From 609427e7e62088cfde2ec8cf8026a4a1faf6520d Mon Sep 17 00:00:00 2001 +From 6e4bf10e4048b6989928b12e4df3d237dbb44a4c Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 2 Mar 2016 23:13:07 -0600 Subject: [PATCH] Send absolute position the first time an entity is seen @@ -76,5 +76,5 @@ index b688e99..370cb9c 100644 entityplayer.playerConnection.sendPacket(packet); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch similarity index 97% rename from Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch rename to Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch index fee5a22644..383a873071 100644 --- a/Spigot-Server-Patches/0043-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 64d0dc145be3cbadee1c880bd14d7f12a416b163 Mon Sep 17 00:00:00 2001 +From f2e99545394c0006dcd8d1499aeaed4a7e8e9ce4 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -69,5 +69,5 @@ index 6f2fcd2..71ecc54 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch similarity index 94% rename from Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch rename to Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch index 0ce24a0485..a8101d7dc3 100644 --- a/Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch @@ -1,4 +1,4 @@ -From 0aaf35605b0cf4b1c71d3678308de74f272958f4 Mon Sep 17 00:00:00 2001 +From a0d114ddff46e2250c3550301b1aa355ef9366c9 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate @@ -19,7 +19,7 @@ index 57480f5..b2b94b8 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 635aad7..feb07a3 100644 +index 1982749..9662ea0 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -45,5 +45,5 @@ index 635aad7..feb07a3 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch similarity index 95% rename from Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch rename to Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch index bdf5379b79..524ffd1c3e 100644 --- a/Spigot-Server-Patches/0045-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch @@ -1,4 +1,4 @@ -From 4ae31b52610780b8ea042468d9f7e92f9fe39aad Mon Sep 17 00:00:00 2001 +From 2087e0322bd2350d334b5292ab192c1be0814418 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 2 Mar 2016 23:42:37 -0600 Subject: [PATCH] Use UserCache for player heads @@ -31,5 +31,5 @@ index f07eb2f..18cc746 100644 // Spigot end } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch similarity index 95% rename from Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch rename to Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch index 9ae2c18f4c..c725743038 100644 --- a/Spigot-Server-Patches/0046-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch @@ -1,11 +1,11 @@ -From 1aeba86f37f8a1f7228c43dcd534c58e60e813cb Mon Sep 17 00:00:00 2001 +From aaf0b0ceee9322dfea65e9a1333add96e1b3f807 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:45:17 -0600 Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1248a9f..0b76735 100644 +index b80282b..49c20b3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1444,10 +1444,10 @@ public abstract class World implements IBlockAccess { @@ -35,5 +35,5 @@ index 1248a9f..0b76735 100644 TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch similarity index 96% rename from Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch rename to Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch index 16e68e8a44..50e2b06a79 100644 --- a/Spigot-Server-Patches/0047-Configurable-Chunk-IO-Thread-Base-Count.patch +++ b/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch @@ -1,4 +1,4 @@ -From 99225c7a0f8aae8fd2a853fe687d026b79b68b2a Mon Sep 17 00:00:00 2001 +From aed18d9a756c228540dab9234db0d182565262eb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:46:57 -0600 Subject: [PATCH] Configurable Chunk IO Thread Base Count @@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644 private static final AsynchronousExecutor instance = new AsynchronousExecutor(new ChunkIOProvider(), BASE_THREADS); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch b/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch similarity index 96% rename from Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch rename to Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch index b37c414e04..776676430c 100644 --- a/Spigot-Server-Patches/0048-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch +++ b/Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch @@ -1,4 +1,4 @@ -From 6baf075a94cb42c637f90740d46550f578b01a4a Mon Sep 17 00:00:00 2001 +From 06479b95dff55813423388c8af4a933ac5dda039 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 2 Mar 2016 23:51:51 -0600 Subject: [PATCH] Don't create Region File's when checking if chunk exists @@ -49,5 +49,5 @@ index f234298..933934f 100644 file1.mkdirs(); } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch similarity index 96% rename from Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch rename to Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch index eedafb8ecc..85a229fe43 100644 --- a/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From cc06513c3046952af2dc49fb74bb9367649bc6ad Mon Sep 17 00:00:00 2001 +From bffea907537f9020197917bf12fd30854e784e30 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -32,5 +32,5 @@ index 04d6355..954d035 100644 entityplayer.playerInteractManager.a((WorldServer) entityplayer.world); String s1 = "local"; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch similarity index 96% rename from Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch rename to Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch index 03fb629121..58cfb07421 100644 --- a/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch +++ b/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch @@ -1,4 +1,4 @@ -From e5e333c8fb98fadbd22786c882eb57256559d107 Mon Sep 17 00:00:00 2001 +From 6a85f370b6f22ff909e7b4e3af7d3b4d906fc93a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:13:45 -0600 Subject: [PATCH] Disable chest cat detection @@ -35,5 +35,5 @@ index d919d78..9d4c15f 100644 EntityOcelot entityocelot; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch similarity index 98% rename from Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch rename to Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch index 9fa39df74c..83a2225e9b 100644 --- a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From f5fbbeec055ca9162db7b1d993ef4fdcd54aabbf Mon Sep 17 00:00:00 2001 +From b6c5618486f53dfafb58fd8b0699a2ebe145013c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:17:12 -0600 Subject: [PATCH] Ensure commands are not ran async diff --git a/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 95% rename from Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch rename to Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch index fd81a1cc23..de4d2e7666 100644 --- a/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,4 +1,4 @@ -From af6c0fa076b068aeee801ed17492e52d8dc528cf Mon Sep 17 00:00:00 2001 +From 96963b668d65bac53132de642fa2e1b3c1b5c967 Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle @@ -33,5 +33,5 @@ index 91ed719..950f07d 100644 } } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch similarity index 95% rename from Spigot-Server-Patches/0053-Optimize-Pathfinding.patch rename to Spigot-Server-Patches/0052-Optimize-Pathfinding.patch index f542b3507d..1bb26ed30b 100644 --- a/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch +++ b/Spigot-Server-Patches/0052-Optimize-Pathfinding.patch @@ -1,4 +1,4 @@ -From 65c8b392d267976d2e7592777f581170493eb311 Mon Sep 17 00:00:00 2001 +From fa3b82efa55cdcd8c7388ec868278b48be00961d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:02:07 -0600 Subject: [PATCH] Optimize Pathfinding @@ -47,5 +47,5 @@ index 4f28b88..43b2be5 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 98% rename from Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch rename to Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch index df0543069a..efefb88b0c 100644 --- a/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From 315637d90a175804eb0576eb881d06a37c81dacb Mon Sep 17 00:00:00 2001 +From b17725413c3a4ad11af1df1d69c71dfd96350a29 Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items @@ -95,5 +95,5 @@ index b80f951..e1fc4ea 100644 while (iterator.hasNext()) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch similarity index 85% rename from Spigot-Server-Patches/0055-Expose-server-CommandMap.patch rename to Spigot-Server-Patches/0054-Expose-server-CommandMap.patch index 78b8ea90b2..124b86d08e 100644 --- a/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 152826c44acd165e785f018fc2cd1b96d8e23b21 Mon Sep 17 00:00:00 2001 +From 0fb5e856063297b816b8a7ca739b31698f293a65 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ff0a441..a9ccc8a 100644 +index 32de676..b7a825a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1566,6 +1566,7 @@ public final class CraftServer implements Server { @@ -17,5 +17,5 @@ index ff0a441..a9ccc8a 100644 return commandMap; } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 94% rename from Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch index 965d2d6b5d..7b5ac07878 100644 --- a/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,4 +1,4 @@ -From 959189247bab3064b63c69bafee372afd8d85f30 Mon Sep 17 00:00:00 2001 +From 3297e1fe6b7fed7ddd2c00a13ce84b44867ba8a5 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 Subject: [PATCH] Be a bit more informative in maxHealth exception @@ -21,5 +21,5 @@ index 4641e3d..aaea4e8 100644 if (health == 0) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0057-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 93% rename from Spigot-Server-Patches/0057-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to Spigot-Server-Patches/0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index bd44d46dcd..1a7386dfc6 100644 --- a/Spigot-Server-Patches/0057-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-Server-Patches/0056-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,11 +1,11 @@ -From 3c8a747e4c7fb30a356120b0098afdc7752fb0c5 Mon Sep 17 00:00:00 2001 +From d932ae0cc0bfac3a416351d0d9f847d7da9a2c82 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 02:21:58 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a9ccc8a..ef3980f 100644 +index b7a825a..b59b756 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1314,6 +1314,18 @@ public final class CraftServer implements Server { @@ -28,7 +28,7 @@ index a9ccc8a..ef3980f 100644 @Deprecated public OfflinePlayer getOfflinePlayer(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e1b04cb..1d4e8b2 100644 +index 318b460..2108001 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -56,5 +56,5 @@ index e1b04cb..1d4e8b2 100644 public String getDisplayName() { return getHandle().displayName; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0058-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch similarity index 98% rename from Spigot-Server-Patches/0058-Player-Tab-List-and-Title-APIs.patch rename to Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch index 724848e752..1e2c7a04b1 100644 --- a/Spigot-Server-Patches/0058-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From fcc4f1380b80f58a3e9e50569e048c994076ef03 Mon Sep 17 00:00:00 2001 +From 7a2dcb0a133f45c7b66c88d85e5a048ea1306012 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -78,7 +78,7 @@ index 7bcafa8..4f6c1c2 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e0ec47f..ab467d8 100644 +index 2108001..7a4ceb3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -173,5 +173,5 @@ index e0ec47f..ab467d8 100644 @Override -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0059-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch similarity index 89% rename from Spigot-Server-Patches/0059-Ensure-inv-drag-is-in-bounds.patch rename to Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch index c7ab877792..c09b5e5d1b 100644 --- a/Spigot-Server-Patches/0059-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch @@ -1,11 +1,11 @@ -From a8af90e7ba90ef632cabe8587805da77dd2f62fd Mon Sep 17 00:00:00 2001 +From 0cd5324300e158b0bde0ea0c1884835194f9bf85 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java -index 69f93d6..0ef93c6 100644 +index 686250e..b826089 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -141,7 +141,7 @@ public abstract class Container { @@ -18,5 +18,5 @@ index 69f93d6..0ef93c6 100644 itemstack1 = playerinventory.getCarried(); if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0060-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch similarity index 97% rename from Spigot-Server-Patches/0060-Change-implementation-of-tile-entity-removal-list.patch rename to Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch index 21e994b264..603891932a 100644 --- a/Spigot-Server-Patches/0060-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch @@ -1,4 +1,4 @@ -From 006b38a4cab58583721baed2bb4adff90d8ef3ec Mon Sep 17 00:00:00 2001 +From aae6be8e71297748f3d6edb5070242db78dc4eb2 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list @@ -24,7 +24,7 @@ index 40398ca..10eb818 100644 public boolean impulse; public int portalCooldown; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0b76735..c8a0ae6 100644 +index 49c20b3..6213997 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; @@ -84,5 +84,5 @@ index 0b76735..c8a0ae6 100644 this.f.clear(); this.l(); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0061-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch similarity index 97% rename from Spigot-Server-Patches/0061-Add-configurable-portal-search-radius.patch rename to Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch index fd3bfab82f..509921fa52 100644 --- a/Spigot-Server-Patches/0061-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch @@ -1,4 +1,4 @@ -From b20c7db532ff71e74c17adeb96fe16d1d83ef5f9 Mon Sep 17 00:00:00 2001 +From c0c4191f67899e3143f6d575291a7a5e9db41293 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius @@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644 private boolean canCreatePortal = true; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0062-Add-velocity-warnings.patch b/Spigot-Server-Patches/0061-Add-velocity-warnings.patch similarity index 92% rename from Spigot-Server-Patches/0062-Add-velocity-warnings.patch rename to Spigot-Server-Patches/0061-Add-velocity-warnings.patch index 75644dc10a..73ed9e32cd 100644 --- a/Spigot-Server-Patches/0062-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0061-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From fe5e6dc3ec8448a373edc77718f64fc51654b95d Mon Sep 17 00:00:00 2001 +From 1eb36b44685655bc53589dcc93ac704000d8f3fa Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index f8aabe2..6d39f6b 100644 +index 5b01727..ae95c76 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -227,6 +227,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -22,5 +22,5 @@ index f8aabe2..6d39f6b 100644 entity.motY = vel.getY(); entity.motZ = vel.getZ(); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0063-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch similarity index 95% rename from Spigot-Server-Patches/0063-Fix-inter-world-teleportation-glitches.patch rename to Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch index 9146b7fdcd..d33ea6c32a 100644 --- a/Spigot-Server-Patches/0063-Fix-inter-world-teleportation-glitches.patch +++ b/Spigot-Server-Patches/0062-Fix-inter-world-teleportation-glitches.patch @@ -1,4 +1,4 @@ -From 94b4bd63864958e0a8d27e2844acea2ddd2103d5 Mon Sep 17 00:00:00 2001 +From 7e1a809697044e335aa5821b9b74887ff00c93de Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Fix inter-world teleportation glitches @@ -25,7 +25,7 @@ index ed63854..7005d69 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6a6d5de..a4ba222 100644 +index 7a4ceb3..e7b04c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -592,7 +592,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -39,5 +39,5 @@ index 6a6d5de..a4ba222 100644 return true; } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0064-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch similarity index 99% rename from Spigot-Server-Patches/0064-Add-exception-reporting-event.patch rename to Spigot-Server-Patches/0063-Add-exception-reporting-event.patch index f532b00431..9aad93e759 100644 --- a/Spigot-Server-Patches/0064-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 191114236c8aa8add618bbfbc2546ce8fbee3399 Mon Sep 17 00:00:00 2001 +From 8269ddeb91023116f0bd1c97371332886f1de29f Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -244,7 +244,7 @@ index 933934f..19fbf9b 100644 } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 171410e..8c35cab 100644 +index 30aacc9..31bafc6 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -7,6 +7,7 @@ import java.util.Random; @@ -292,7 +292,7 @@ index 7af5b7d..2b49802 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c8a0ae6..8272d89 100644 +index 6213997..ad6ad75 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,5 +1,7 @@ @@ -372,5 +372,5 @@ index 198c37c..cdb836a 100644 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0065-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 95% rename from Spigot-Server-Patches/0065-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index 878fa8290f..8603bd0838 100644 --- a/Spigot-Server-Patches/0065-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From 54384862cb8a34c0892bf94a4e77660c531d6dc2 Mon Sep 17 00:00:00 2001 +From cce8316893f358e8804df5975fff98d9a57af614 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -26,5 +26,5 @@ index 9fc83c4..b3b13ba 100644 packetdataserializer.a(this.a); } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0066-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch similarity index 97% rename from Spigot-Server-Patches/0066-Disable-Scoreboards-for-non-players-by-default.patch rename to Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch index ad7a98a8d7..d7c140c2ec 100644 --- a/Spigot-Server-Patches/0066-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From 9d9f39fa78bdfe32ca8c538d05c840470d9ce5ae Mon Sep 17 00:00:00 2001 +From 6f05d80095233fccb6de27c6b01d1922759a6a3b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default @@ -49,5 +49,5 @@ index 10eb818..875dcc8 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 96% rename from Spigot-Server-Patches/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 35024752da..e8cb54e578 100644 --- a/Spigot-Server-Patches/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From 8c3db58f89aa782429d2f32e0da3c3cf9f3d39a9 Mon Sep 17 00:00:00 2001 +From 81be8d010592ebcb1bf34ccb0168c779ce81c430 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/Spigot-Server-Patches/0068-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch similarity index 98% rename from Spigot-Server-Patches/0068-Complete-resource-pack-API.patch rename to Spigot-Server-Patches/0067-Complete-resource-pack-API.patch index 7002bdab68..9fed1a478b 100644 --- a/Spigot-Server-Patches/0068-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From 2c3f33cf991b20a34238a2472472a37b70134149 Mon Sep 17 00:00:00 2001 +From 3a3b561fa65a9f3968be6fbf9e6a810da8930a8e Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/Spigot-Server-Patches/0069-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch similarity index 99% rename from Spigot-Server-Patches/0069-Chunk-save-queue-improvements.patch rename to Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch index add7d94b63..cfef51e682 100644 --- a/Spigot-Server-Patches/0069-Chunk-save-queue-improvements.patch +++ b/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch @@ -1,4 +1,4 @@ -From 88988bc9d659401547d7d18f14f246d99dafd814 Mon Sep 17 00:00:00 2001 +From 4b8f5ca789ee647a2dba593df65f22b8a76f411c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Mar 2016 18:18:37 -0600 Subject: [PATCH] Chunk save queue improvements @@ -177,5 +177,5 @@ index acfdd52..fdbaf5f 100644 if (this.b.isEmpty()) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0070-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch similarity index 97% rename from Spigot-Server-Patches/0070-Chunk-Save-Reattempt.patch rename to Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch index 6c87340282..3709f77dba 100644 --- a/Spigot-Server-Patches/0070-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From 5b78b518b5c1eb3c2699e94e7ea20c74cd91dc94 Mon Sep 17 00:00:00 2001 +From 716634213d675f576b1e196476bcf4380267b36c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -42,5 +42,5 @@ index be13c11..9cfc46b 100644 } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0071-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch similarity index 96% rename from Spigot-Server-Patches/0071-Default-loading-permissions.yml-before-plugins.patch rename to Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch index a21ea9d29a..22fc91eaf1 100644 --- a/Spigot-Server-Patches/0071-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From b7317d54c56155ca9d901cc1905796e26bc69570 Mon Sep 17 00:00:00 2001 +From 62a1748fca01d80144e90defa25e5d9ff6fadc36 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -30,7 +30,7 @@ index c1a8243..88b6778 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ef3980f..bb49a22 100644 +index b59b756..7d2d9e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -316,6 +316,7 @@ public final class CraftServer implements Server { @@ -51,5 +51,5 @@ index ef3980f..bb49a22 100644 CraftDefaultPermissions.registerCorePermissions(); helpMap.initializeCommands(); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0072-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch similarity index 92% rename from Spigot-Server-Patches/0072-Allow-Reloading-of-Custom-Permissions.patch rename to Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch index a048af826b..98614b226a 100644 --- a/Spigot-Server-Patches/0072-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From b7ca75de3ebba6ca6772958e9ae6079e4fc5a385 Mon Sep 17 00:00:00 2001 +From ea764e7810887eefc6a4c52d4977bfd81adad442 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bb49a22..180a297 100644 +index 7d2d9e2..0693d12 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1826,4 +1826,21 @@ public final class CraftServer implements Server { @@ -32,5 +32,5 @@ index bb49a22..180a297 100644 + // Paper end } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0073-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch similarity index 91% rename from Spigot-Server-Patches/0073-Remove-Metadata-on-reload.patch rename to Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch index 224c0b6a06..6d7f878221 100644 --- a/Spigot-Server-Patches/0073-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From 29b28b03b5e0735a441d52d55b8847ca6e07d7c6 Mon Sep 17 00:00:00 2001 +From b6bf708e91cda0ce2d7cb923e75fc94dacdbdb2d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Remove Metadata on reload @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 180a297..7364705 100644 +index 0693d12..f154248 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -739,6 +739,14 @@ public final class CraftServer implements Server { @@ -26,5 +26,5 @@ index 180a297..7364705 100644 commandMap.clearCommands(); resetRecipes(); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0074-Undead-horse-leashing.patch b/Spigot-Server-Patches/0073-Undead-horse-leashing.patch similarity index 94% rename from Spigot-Server-Patches/0074-Undead-horse-leashing.patch rename to Spigot-Server-Patches/0073-Undead-horse-leashing.patch index b5d4e96e8e..99d5b27885 100644 --- a/Spigot-Server-Patches/0074-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0073-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 39c79a5582c9b90c852330cb1dd78452af1096a9 Mon Sep 17 00:00:00 2001 +From 48c89f37527f39d4bc234b16769b8f482a35fbe5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -20,7 +20,7 @@ index b3678da..029eb39 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index da95a59..67f66fd 100644 +index d74ccd6..3416c7a 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -115,7 +115,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -33,5 +33,5 @@ index da95a59..67f66fd 100644 protected void q(float f) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0075-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch similarity index 91% rename from Spigot-Server-Patches/0075-Fix-Furnace-cook-time-bug.patch rename to Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch index 33a506e53a..4288315c0e 100644 --- a/Spigot-Server-Patches/0075-Fix-Furnace-cook-time-bug.patch +++ b/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch @@ -1,4 +1,4 @@ -From f2abce9bbd30a3db0b929462ffc7cd2f6d44c80d Mon Sep 17 00:00:00 2001 +From 07a7621aa33ff2427947824eb0dcafdc3fc77537 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:24:53 -0400 Subject: [PATCH] Fix Furnace cook time bug @@ -9,7 +9,7 @@ cook in the expected amount of time as the cook time was not decremented correct This patch ensures that furnaces cook to the correct wall time expectation. diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 93a610a..661716d 100644 +index 2f1f3ed..ef63236 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -165,7 +165,7 @@ public class TileEntityFurnace extends TileEntityContainer implements ITickable, @@ -22,5 +22,5 @@ index 93a610a..661716d 100644 this.burn(); flag1 = true; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0076-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from Spigot-Server-Patches/0076-Handle-Item-Meta-Inconsistencies.patch rename to Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch index 85b937a17e..00e7b50d96 100644 --- a/Spigot-Server-Patches/0076-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From d85208945003e34255152d5268d9db24a609f8a3 Mon Sep 17 00:00:00 2001 +From f5f66d0d6388d120fe4e026e36ab0ebe9d02ece0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies diff --git a/Spigot-Server-Patches/0077-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 94% rename from Spigot-Server-Patches/0077-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch index ed4afd2bba..fd167c7833 100644 --- a/Spigot-Server-Patches/0077-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 745dd2c92706e3e70d9e4eeed52e40e0670b473f Mon Sep 17 00:00:00 2001 +From 875d996f5eb2cd385f95f957e18f97a3ac5f68f0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -24,7 +24,7 @@ index 029eb39..9cce672 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 287566c..bb332b3 100644 +index f2317e5..4b01cc0 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -37,5 +37,5 @@ index 287566c..bb332b3 100644 } } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0078-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch similarity index 97% rename from Spigot-Server-Patches/0078-Add-World-Util-Methods.patch rename to Spigot-Server-Patches/0077-Add-World-Util-Methods.patch index 71f6708cf6..b154d02683 100644 --- a/Spigot-Server-Patches/0078-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From 890c1645cb95a10a2b3269ed85cb463e3e424b05 Mon Sep 17 00:00:00 2001 +From 948d3ade5648c450c629839997c0982280f8d8e5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8272d89..223250f 100644 +index ad6ad75..7d3770d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess { @@ -93,5 +93,5 @@ index 8272d89..223250f 100644 // CraftBukkit start - tree generation if (captureTreeGeneration) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0079-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch similarity index 99% rename from Spigot-Server-Patches/0079-Optimized-Light-Level-Comparisons.patch rename to Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch index 250276bbae..ca98ea96aa 100644 --- a/Spigot-Server-Patches/0079-Optimized-Light-Level-Comparisons.patch +++ b/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch @@ -1,4 +1,4 @@ -From b2ed021cc393f2627735d38208e87c972ff5dcd1 Mon Sep 17 00:00:00 2001 +From 94e2ca15762051fb10c5b1fd3c20d0010320a799 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 21:22:56 -0400 Subject: [PATCH] Optimized Light Level Comparisons @@ -131,5 +131,5 @@ index 897882c..970fabf 100644 if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0080-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch similarity index 95% rename from Spigot-Server-Patches/0080-Pass-world-to-Village-creation.patch rename to Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch index 8825a5442d..338eaa76be 100644 --- a/Spigot-Server-Patches/0080-Pass-world-to-Village-creation.patch +++ b/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch @@ -1,4 +1,4 @@ -From aa4add7106265a50c2756dcd8dbc5b6912ffc116 Mon Sep 17 00:00:00 2001 +From bea3556fa7b29fdf1627b7acd61e4f5f48ea2c59 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 19 Mar 2016 15:16:54 -0400 Subject: [PATCH] Pass world to Village creation @@ -32,5 +32,5 @@ index 2ab381d..817c836 100644 this.d = BlockPosition.ZERO; this.j = Maps.newHashMap(); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0081-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch similarity index 95% rename from Spigot-Server-Patches/0081-Custom-replacement-for-eaten-items.patch rename to Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch index ed6ece03cd..06bcfa3bd7 100644 --- a/Spigot-Server-Patches/0081-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From 6de1e740885e08b20f142d25e047d1a949ce0cbc Mon Sep 17 00:00:00 2001 +From 45328410f1076259957edf11907b79c1c284db35 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/Spigot-Server-Patches/0082-Set-health-before-death-event.patch b/Spigot-Server-Patches/0081-Set-health-before-death-event.patch similarity index 96% rename from Spigot-Server-Patches/0082-Set-health-before-death-event.patch rename to Spigot-Server-Patches/0081-Set-health-before-death-event.patch index 04c5e72a15..b6bacb9892 100644 --- a/Spigot-Server-Patches/0082-Set-health-before-death-event.patch +++ b/Spigot-Server-Patches/0081-Set-health-before-death-event.patch @@ -1,4 +1,4 @@ -From 6c7006b595785c4b8b0435af3bd7055fcf019576 Mon Sep 17 00:00:00 2001 +From 9ef19d23fd92041aa9c5da721b7253f09c5e64e3 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 19 Jul 2015 16:51:38 -0400 Subject: [PATCH] Set health before death event @@ -45,5 +45,5 @@ index 2a77cd4..0493c1b 100644 public double getMaxHealth() { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 96% rename from Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 486772682a..2cd9102b52 100644 --- a/Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,4 +1,4 @@ -From 5fc1a30d419fe9aebcaff5cb6bfb2e559b83b40e Mon Sep 17 00:00:00 2001 +From 04b8471c6a6152c2658e668e0431e5e76bc212d9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data @@ -44,7 +44,7 @@ index 539d016..1eee8a3 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5be1a6f..06e401a 100644 +index 9ef6ba2..eba73cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1412,6 +1412,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0084-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch similarity index 93% rename from Spigot-Server-Patches/0084-Catch-Async-PlayerChunkMap-operations.patch rename to Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch index f92ee7b98b..8d229458ef 100644 --- a/Spigot-Server-Patches/0084-Catch-Async-PlayerChunkMap-operations.patch +++ b/Spigot-Server-Patches/0083-Catch-Async-PlayerChunkMap-operations.patch @@ -1,4 +1,4 @@ -From 67cdeb4969936cc2040d98c8fe777c852df52ad6 Mon Sep 17 00:00:00 2001 +From 2ac0bf359dd04900d5cc9abe28b618ee3cd65177 Mon Sep 17 00:00:00 2001 From: Daniel Ennis Date: Sun, 20 Mar 2016 15:22:42 -0400 Subject: [PATCH] Catch Async PlayerChunkMap operations diff --git a/Spigot-Server-Patches/0085-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch similarity index 98% rename from Spigot-Server-Patches/0085-Support-offline-mode-in-whitelist-command-as-well.patch rename to Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch index 6133b141e6..4507a71c92 100644 --- a/Spigot-Server-Patches/0085-Support-offline-mode-in-whitelist-command-as-well.patch +++ b/Spigot-Server-Patches/0084-Support-offline-mode-in-whitelist-command-as-well.patch @@ -1,4 +1,4 @@ -From 43d4f73060153a5e017db795dfdcee5e42f00bab Mon Sep 17 00:00:00 2001 +From bba6f36ded9d5541b4a9370962bddafe36f8f22a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 21 Mar 2016 00:19:18 -0500 Subject: [PATCH] Support offline mode in whitelist command as well @@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644 + // Paper end } -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0086-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch similarity index 93% rename from Spigot-Server-Patches/0086-Fix-SkullCache-case-bug.patch rename to Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch index a202b50d00..9a8e037f78 100644 --- a/Spigot-Server-Patches/0086-Fix-SkullCache-case-bug.patch +++ b/Spigot-Server-Patches/0085-Fix-SkullCache-case-bug.patch @@ -1,4 +1,4 @@ -From 8f8a9fef6f5ec940e55af3abcfa351eb280db615 Mon Sep 17 00:00:00 2001 +From aa51369f8e36ad18e7879bacbb6928a4b09523cb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jan 2016 21:48:24 -0500 Subject: [PATCH] Fix SkullCache case bug @@ -18,5 +18,5 @@ index 91ca4a2..edd6fb6 100644 callback.apply(profile); } else { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0087-Waving-banner-workaround.patch b/Spigot-Server-Patches/0086-Waving-banner-workaround.patch similarity index 94% rename from Spigot-Server-Patches/0087-Waving-banner-workaround.patch rename to Spigot-Server-Patches/0086-Waving-banner-workaround.patch index 43c6472107..1912a4cfb8 100644 --- a/Spigot-Server-Patches/0087-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0086-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From 428f579770b2aa61fc95a85a5561c3a9ac77d184 Mon Sep 17 00:00:00 2001 +From 06895d6610c5ade61bdc43016d06e08322d3dbf2 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644 public void a(PacketDataSerializer packetdataserializer) throws IOException { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0088-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch similarity index 94% rename from Spigot-Server-Patches/0088-Use-a-Shared-Random-for-Entities.patch rename to Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch index 5e55154ace..44e370d170 100644 --- a/Spigot-Server-Patches/0088-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0087-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 554f7c012ab7cb05dbaf758c2a6b70b15dc2f634 Mon Sep 17 00:00:00 2001 +From 7c112d4d93a3caf178493739c38a195c33160c3d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -27,5 +27,5 @@ index 875dcc8..ae16663 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0089-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch similarity index 92% rename from Spigot-Server-Patches/0089-Don-t-teleport-dead-entities.patch rename to Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch index 5ff61406a4..beb2b9ce42 100644 --- a/Spigot-Server-Patches/0089-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0088-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From 04db83c72b0dd6425fd8d800822a51dcd56e6d5c Mon Sep 17 00:00:00 2001 +From 9b15cb205ed349c2902591124e6b009f844aecdc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -20,5 +20,5 @@ index ae16663..d8ebe11 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0090-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch similarity index 96% rename from Spigot-Server-Patches/0090-Optimize-Chunk-Access.patch rename to Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch index e990118148..8a76212ebe 100644 --- a/Spigot-Server-Patches/0090-Optimize-Chunk-Access.patch +++ b/Spigot-Server-Patches/0089-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From 77c802f0bbd04aeeb2dece18e0efc00950c987ec Mon Sep 17 00:00:00 2001 +From 7391498a32290021322cfe4879630dcc591308ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access @@ -42,5 +42,5 @@ index 54ca738..902f9ac 100644 public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) { -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0091-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 94% rename from Spigot-Server-Patches/0091-Configurable-spawn-chances-for-skeleton-horses.patch rename to Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch index 52b61bce1e..8791ab370e 100644 --- a/Spigot-Server-Patches/0091-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0090-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From 49d53ee95df9d1cad58e78621fd5a342062e9e09 Mon Sep 17 00:00:00 2001 +From 7cd6c9e03ab94fa8b8bf44c9bdceef268dec51e1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -19,7 +19,7 @@ index 9cce672..d92ccc7 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index c84121c..04f61e9 100644 +index 52b70e7..2c75c15 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -32,5 +32,5 @@ index c84121c..04f61e9 100644 entityhorseskeleton.p(true); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0092-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch similarity index 97% rename from Spigot-Server-Patches/0092-Optimize-isValidLocation-getType-and-getBlockData-fo.patch rename to Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index d998c6a44d..c7b2f72dc2 100644 --- a/Spigot-Server-Patches/0092-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From 9b31029333fb85ecd0627b4c69982c9b562987ec Mon Sep 17 00:00:00 2001 +From 63f474cc48cbf0fe7d2c67f011d835b607fb03d3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -98,7 +98,7 @@ index 3d784d0..afdc4a7 100644 private NibbleArray skyLight; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ecd2d26..224e4c9 100644 +index 7d3770d..8ca33d0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess { @@ -227,7 +227,7 @@ index ecd2d26..224e4c9 100644 public boolean B() { return this.J < 4; -@@ -2045,7 +2054,7 @@ public abstract class World implements IBlockAccess { +@@ -2037,7 +2046,7 @@ public abstract class World implements IBlockAccess { public Map capturedTileEntities = Maps.newHashMap(); @Nullable public TileEntity getTileEntity(BlockPosition blockposition) { @@ -236,7 +236,7 @@ index ecd2d26..224e4c9 100644 return null; } else { // CraftBukkit start -@@ -2086,7 +2095,7 @@ public abstract class World implements IBlockAccess { +@@ -2078,7 +2087,7 @@ public abstract class World implements IBlockAccess { } public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) { @@ -245,7 +245,7 @@ index ecd2d26..224e4c9 100644 if (tileentity != null && !tileentity.y()) { // CraftBukkit start if (captureBlockStates) { -@@ -2149,7 +2158,7 @@ public abstract class World implements IBlockAccess { +@@ -2141,7 +2150,7 @@ public abstract class World implements IBlockAccess { } public boolean d(BlockPosition blockposition, boolean flag) { @@ -255,5 +255,5 @@ index ecd2d26..224e4c9 100644 } else { Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); -- -2.10.2 +2.9.3 diff --git a/Spigot-Server-Patches/0093-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch similarity index 94% rename from Spigot-Server-Patches/0093-Fix-cooked-fish-legacy-import.patch rename to Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch index ccf9d32144..ede286f4db 100644 --- a/Spigot-Server-Patches/0093-Fix-cooked-fish-legacy-import.patch +++ b/Spigot-Server-Patches/0092-Fix-cooked-fish-legacy-import.patch @@ -1,4 +1,4 @@ -From 1224bc8a7663374d3169a7b37fd82fa15a070459 Mon Sep 17 00:00:00 2001 +From 27aa9e04eed7118c83df555e0f0509e38094f18d Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 04:32:08 -0500 Subject: [PATCH] Fix cooked fish legacy import diff --git a/Spigot-Server-Patches/0094-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch similarity index 98% rename from Spigot-Server-Patches/0094-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch rename to Spigot-Server-Patches/0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch index d2213958bf..e908ab024a 100644 --- a/Spigot-Server-Patches/0094-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch +++ b/Spigot-Server-Patches/0093-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch @@ -1,4 +1,4 @@ -From dd87a92db737c55ac67cb8bdd74ad21ddfe8e7c5 Mon Sep 17 00:00:00 2001 +From 0af5380a6a18ec3d7c06e7fb4501909b55d2da7b Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sat, 26 Mar 2016 21:36:05 -0500 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator diff --git a/Spigot-Server-Patches/0095-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0094-Access-items-by-EquipmentSlot.patch similarity index 97% rename from Spigot-Server-Patches/0095-Access-items-by-EquipmentSlot.patch rename to Spigot-Server-Patches/0094-Access-items-by-EquipmentSlot.patch index c11b32f660..def9a3b0ca 100644 --- a/Spigot-Server-Patches/0095-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0094-Access-items-by-EquipmentSlot.patch @@ -1,4 +1,4 @@ -From f0d56cc21c423373e46a085939b4192f57a1013f Mon Sep 17 00:00:00 2001 +From 24bd2ba47631a8ddefd94a7d2822b5a22d2813e7 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/Spigot-Server-Patches/0096-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0095-Check-async-remove-unused-vars-GH-159.patch similarity index 96% rename from Spigot-Server-Patches/0096-Check-async-remove-unused-vars-GH-159.patch rename to Spigot-Server-Patches/0095-Check-async-remove-unused-vars-GH-159.patch index b059f08aab..de02071a37 100644 --- a/Spigot-Server-Patches/0096-Check-async-remove-unused-vars-GH-159.patch +++ b/Spigot-Server-Patches/0095-Check-async-remove-unused-vars-GH-159.patch @@ -1,4 +1,4 @@ -From ecd85fe47a95c6799d3137101dc4e4644095b8a6 Mon Sep 17 00:00:00 2001 +From 05023155fb6a414d96f5b04f20ceec957c5e4a3b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 27 Mar 2016 20:24:05 -0500 Subject: [PATCH] Check async, remove unused vars, GH-159 diff --git a/Spigot-Server-Patches/0097-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0096-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch similarity index 97% rename from Spigot-Server-Patches/0097-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch rename to Spigot-Server-Patches/0096-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index 03c3c84567..b507cf474d 100644 --- a/Spigot-Server-Patches/0097-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/Spigot-Server-Patches/0096-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From 6eacb52095e6eac9c9f2d94b3b50c721448a9278 Mon Sep 17 00:00:00 2001 +From 8152281862b9dd18cd83d50a25445213da0aa6d4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 224e4c9..0ac8a57 100644 +index 8ca33d0..019b185 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0098-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 91% rename from Spigot-Server-Patches/0098-Entity-AddTo-RemoveFrom-World-Events.patch rename to Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch index f9d24b1b3a..6573d1a9fd 100644 --- a/Spigot-Server-Patches/0098-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,11 +1,11 @@ -From 26c49b0604fc10ccbe754dd33791c68c57d8ae84 Mon Sep 17 00:00:00 2001 +From c056b9c4109ab49eb510cc72b9f1b984a96ff8bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0ac8a57..fbe33a8 100644 +index 019b185..2f92c78 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1179,6 +1179,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0099-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0098-Configurable-Chunk-Inhabited-Timer.patch similarity index 95% rename from Spigot-Server-Patches/0099-Configurable-Chunk-Inhabited-Timer.patch rename to Spigot-Server-Patches/0098-Configurable-Chunk-Inhabited-Timer.patch index ef435eb01a..bf0ab1f770 100644 --- a/Spigot-Server-Patches/0099-Configurable-Chunk-Inhabited-Timer.patch +++ b/Spigot-Server-Patches/0098-Configurable-Chunk-Inhabited-Timer.patch @@ -1,4 +1,4 @@ -From 85e6989fdc7fd57d46442adca43233022c0f11be Mon Sep 17 00:00:00 2001 +From a965153e8399e27c9de94c80a44bb9ddefa2fcec Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Timer diff --git a/Spigot-Server-Patches/0100-EntityPathfindEvent.patch b/Spigot-Server-Patches/0099-EntityPathfindEvent.patch similarity index 96% rename from Spigot-Server-Patches/0100-EntityPathfindEvent.patch rename to Spigot-Server-Patches/0099-EntityPathfindEvent.patch index 3a240ad5d1..713ca2f5ab 100644 --- a/Spigot-Server-Patches/0100-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0099-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From b0e2f5308c90ca48dc24af1e86b20520e963eba9 Mon Sep 17 00:00:00 2001 +From bfadeb0838decd794069106ce6357842b140ea06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent diff --git a/Spigot-Server-Patches/0101-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0100-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch similarity index 97% rename from Spigot-Server-Patches/0101-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch rename to Spigot-Server-Patches/0100-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch index 0dda5a5e0b..e78205c354 100644 --- a/Spigot-Server-Patches/0101-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch +++ b/Spigot-Server-Patches/0100-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch @@ -1,4 +1,4 @@ -From 8044718f3a6e4aedccd7d51573c752e2e3ff2492 Mon Sep 17 00:00:00 2001 +From cf17689530a155b1d3d0e45c72430be7d603cde0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 22:03:09 -0400 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks diff --git a/Spigot-Server-Patches/0102-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0101-Reduce-IO-ops-opening-a-new-region-file.patch similarity index 96% rename from Spigot-Server-Patches/0102-Reduce-IO-ops-opening-a-new-region-file.patch rename to Spigot-Server-Patches/0101-Reduce-IO-ops-opening-a-new-region-file.patch index fcd3abe331..8caff018c1 100644 --- a/Spigot-Server-Patches/0102-Reduce-IO-ops-opening-a-new-region-file.patch +++ b/Spigot-Server-Patches/0101-Reduce-IO-ops-opening-a-new-region-file.patch @@ -1,4 +1,4 @@ -From 471591d79ffceac151b5a06c667ccaf32a356c4e Mon Sep 17 00:00:00 2001 +From 26ec2b878c8559f55150b3df075119d3ef289f25 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 06:56:23 +0300 Subject: [PATCH] Reduce IO ops opening a new region file. diff --git a/Spigot-Server-Patches/0103-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0102-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 98% rename from Spigot-Server-Patches/0103-Sanitise-RegionFileCache-and-make-configurable.patch rename to Spigot-Server-Patches/0102-Sanitise-RegionFileCache-and-make-configurable.patch index dda7315e38..03f3b6c83b 100644 --- a/Spigot-Server-Patches/0103-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0102-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From 325d3bb7b69bb86e217ca758a8e12a1a946c4972 Mon Sep 17 00:00:00 2001 +From 90af70dc2eb3165b306dab7c34fcb4f2c04646ba Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. diff --git a/Spigot-Server-Patches/0104-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0103-Add-getEntity-by-UUID-API.patch similarity index 97% rename from Spigot-Server-Patches/0104-Add-getEntity-by-UUID-API.patch rename to Spigot-Server-Patches/0103-Add-getEntity-by-UUID-API.patch index 0aa2d92c2b..b2d6c6b194 100644 --- a/Spigot-Server-Patches/0104-Add-getEntity-by-UUID-API.patch +++ b/Spigot-Server-Patches/0103-Add-getEntity-by-UUID-API.patch @@ -1,4 +1,4 @@ -From 9612faedc986c334b3f3b434b1b41e6b27f6d440 Mon Sep 17 00:00:00 2001 +From 74b44807f14bbcfb54136ec5af81eaa1e061a950 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Wed, 30 Mar 2016 01:20:11 -0500 Subject: [PATCH] Add getEntity by UUID API diff --git a/Spigot-Server-Patches/0105-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0104-Use-Optimized-Collections.patch similarity index 97% rename from Spigot-Server-Patches/0105-Use-Optimized-Collections.patch rename to Spigot-Server-Patches/0104-Use-Optimized-Collections.patch index 1135ba566e..973371439b 100644 --- a/Spigot-Server-Patches/0105-Use-Optimized-Collections.patch +++ b/Spigot-Server-Patches/0104-Use-Optimized-Collections.patch @@ -1,4 +1,4 @@ -From 6024663bf49d367680f557bc9e63c89a4eafceb7 Mon Sep 17 00:00:00 2001 +From 5f74f4b584ca2388c4e5aed9dfb08cac40f941f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 Subject: [PATCH] Use Optimized Collections diff --git a/Spigot-Server-Patches/0106-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0105-Do-not-load-chunks-for-light-checks.patch similarity index 90% rename from Spigot-Server-Patches/0106-Do-not-load-chunks-for-light-checks.patch rename to Spigot-Server-Patches/0105-Do-not-load-chunks-for-light-checks.patch index 5cb266d56f..f6773c7c08 100644 --- a/Spigot-Server-Patches/0106-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0105-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From a22e78030bbed897eddbf5a6557bbe0cc2d78468 Mon Sep 17 00:00:00 2001 +From 73380b1eaea2bd41dc6e9f792b06c45ff1c5661d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for light checks @@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fbe33a8..6c72e7e 100644 +index 2f92c78..2374a14 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -759,6 +759,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0107-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0106-Add-PlayerUseUnknownEntityEvent.patch similarity index 96% rename from Spigot-Server-Patches/0107-Add-PlayerUseUnknownEntityEvent.patch rename to Spigot-Server-Patches/0106-Add-PlayerUseUnknownEntityEvent.patch index c44e69f7a2..30f0c4cb95 100644 --- a/Spigot-Server-Patches/0107-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0106-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From f0bf2a707a75e985bf9c47d612ef69e191481032 Mon Sep 17 00:00:00 2001 +From e8e000b9e0e53bc3834ae69d60d59bcbbf27755f Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/Spigot-Server-Patches/0108-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0107-Fix-reducedDebugInfo-not-initialized-on-client.patch similarity index 94% rename from Spigot-Server-Patches/0108-Fix-reducedDebugInfo-not-initialized-on-client.patch rename to Spigot-Server-Patches/0107-Fix-reducedDebugInfo-not-initialized-on-client.patch index 8dd212571b..acdbdd069f 100644 --- a/Spigot-Server-Patches/0108-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0107-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,4 +1,4 @@ -From c28acd09d82ab7410f79a4d2b34545acc52b0438 Mon Sep 17 00:00:00 2001 +From 18bd0f26a2508867740717cd8c4f44dd74c94558 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/Spigot-Server-Patches/0109-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0108-Configurable-Grass-Spread-Tick-Rate.patch similarity index 96% rename from Spigot-Server-Patches/0109-Configurable-Grass-Spread-Tick-Rate.patch rename to Spigot-Server-Patches/0108-Configurable-Grass-Spread-Tick-Rate.patch index ddb2b8cde3..8b871978a4 100644 --- a/Spigot-Server-Patches/0109-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0108-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,4 +1,4 @@ -From de0c198ba4a6f03d184acf8b6d003e00f7f765c3 Mon Sep 17 00:00:00 2001 +From 5db46b601603e6d1968ec56ed2c3f898d1704700 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/Spigot-Server-Patches/0110-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 96% rename from Spigot-Server-Patches/0110-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 3ce68d6dcf..4e0b0b3106 100644 --- a/Spigot-Server-Patches/0110-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From b2b8342d1fcbb7475bbf3e566ec8fd666f5ea38f Mon Sep 17 00:00:00 2001 +From 90aeca3f878e9215abdb0a3ed06c3b8931dfec5f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -39,10 +39,10 @@ index 3339985..4cb71eb 100644 if (i1 - j > 1000L) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6c72e7e..c82ea39 100644 +index 2374a14..841a6c7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -3222,8 +3222,9 @@ public abstract class World implements IBlockAccess { +@@ -3214,8 +3214,9 @@ public abstract class World implements IBlockAccess { int k = i * 16 + 8 - blockposition.getX(); int l = j * 16 + 8 - blockposition.getZ(); boolean flag = true; diff --git a/Spigot-Server-Patches/0111-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0110-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 89% rename from Spigot-Server-Patches/0111-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to Spigot-Server-Patches/0110-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index e629b9af91..fb62713c24 100644 --- a/Spigot-Server-Patches/0111-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0110-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 94112ba932ea43628bc61dc09236b7ffd88323de Mon Sep 17 00:00:00 2001 +From 3fdb1dae891799dd98d2a288e12a3efc279ae9d6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c82ea39..5164082 100644 +index 841a6c7..46b1323 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -532,6 +532,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0112-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch similarity index 88% rename from Spigot-Server-Patches/0112-Don-t-spam-reload-spawn-chunks-in-nether-end.patch rename to Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch index 27e819aee3..023cd8cc49 100644 --- a/Spigot-Server-Patches/0112-Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -1,14 +1,14 @@ -From 8393a8e37b3918941a5886a97b6e64e94297e8b3 Mon Sep 17 00:00:00 2001 +From 6d984b9d484fc5c4de82da88f1bbbfcbd9cbed71 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 19:42:22 -0400 Subject: [PATCH] Don't spam reload spawn chunks in nether/end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5164082..acc0272 100644 +index 46b1323..e5a2a65 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -3218,6 +3218,7 @@ public abstract class World implements IBlockAccess { +@@ -3210,6 +3210,7 @@ public abstract class World implements IBlockAccess { return this.N; } diff --git a/Spigot-Server-Patches/0113-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0112-Remove-Debug-checks-from-DataBits.patch similarity index 96% rename from Spigot-Server-Patches/0113-Remove-Debug-checks-from-DataBits.patch rename to Spigot-Server-Patches/0112-Remove-Debug-checks-from-DataBits.patch index 32dc0425d7..9ba7126e33 100644 --- a/Spigot-Server-Patches/0113-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0112-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From efe0d10cf4b3ae44d99d0bc243315430db1d0e81 Mon Sep 17 00:00:00 2001 +From de9aae490f42cda27e08d99884b4b4e4fe6b1d0d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits diff --git a/Spigot-Server-Patches/0114-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0113-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 97% rename from Spigot-Server-Patches/0114-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to Spigot-Server-Patches/0113-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index b29e9b2bec..aa8ba4cbdc 100644 --- a/Spigot-Server-Patches/0114-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0113-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From dadfa1ee4ca5b33de2bcd13a7bf691cd1d2d234f Mon Sep 17 00:00:00 2001 +From 9f87cd16312f919435c50acadbc36a728e503a08 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names diff --git a/Spigot-Server-Patches/0115-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0114-Workaround-for-setting-passengers-on-players.patch similarity index 92% rename from Spigot-Server-Patches/0115-Workaround-for-setting-passengers-on-players.patch rename to Spigot-Server-Patches/0114-Workaround-for-setting-passengers-on-players.patch index a7618b1a6a..bb4651e6d8 100644 --- a/Spigot-Server-Patches/0115-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0114-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From ad01e2c491ed045ba0d29e61916d7f7fe692d096 Mon Sep 17 00:00:00 2001 +From 1fa6dccda9721bf0c1eb8aecb6440b914c6f37ad Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 06e401a..1a4603d 100644 +index eba73cf..f16fe84 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -602,6 +602,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0116-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch similarity index 95% rename from Spigot-Server-Patches/0116-Remove-unused-World-Tile-Entity-List.patch rename to Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch index 55bdf4fbb6..b29c411f90 100644 --- a/Spigot-Server-Patches/0116-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 927b8519e21bbe8d01523a1408314fe3762a9ee8 Mon Sep 17 00:00:00 2001 +From a1c15375138e393b0d238cea61db7002e8a2634a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index acc0272..b8fefb8 100644 +index e5a2a65..948e459 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess { @@ -57,7 +57,7 @@ index acc0272..b8fefb8 100644 this.tileEntityListTick.add(tileentity); } -@@ -2142,7 +2142,7 @@ public abstract class World implements IBlockAccess { +@@ -2134,7 +2134,7 @@ public abstract class World implements IBlockAccess { } else { if (tileentity != null) { this.b.remove(tileentity); diff --git a/Spigot-Server-Patches/0117-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0116-Don-t-tick-Skulls-unused-code.patch similarity index 92% rename from Spigot-Server-Patches/0117-Don-t-tick-Skulls-unused-code.patch rename to Spigot-Server-Patches/0116-Don-t-tick-Skulls-unused-code.patch index b0cb1f13b8..4a7a7c42b7 100644 --- a/Spigot-Server-Patches/0117-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0116-Don-t-tick-Skulls-unused-code.patch @@ -1,4 +1,4 @@ -From d94d2932a04f0f9a94ceac00af829123758ba063 Mon Sep 17 00:00:00 2001 +From e07b3c609ad811d3fce71bafc7ccc0694b3289ce Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code diff --git a/Spigot-Server-Patches/0118-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0117-Configurable-Player-Collision.patch similarity index 99% rename from Spigot-Server-Patches/0118-Configurable-Player-Collision.patch rename to Spigot-Server-Patches/0117-Configurable-Player-Collision.patch index 9018806203..7526b3932c 100644 --- a/Spigot-Server-Patches/0118-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0117-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From a4bf0117bb3933d3d85c8dc3712a9efd9f88a36d Mon Sep 17 00:00:00 2001 +From 3ed2f46a1d5ad43cef080a52b198425b73458377 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/Spigot-Server-Patches/0119-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0118-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 97% rename from Spigot-Server-Patches/0119-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to Spigot-Server-Patches/0118-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 5cf80a784c..c5ebf1785a 100644 --- a/Spigot-Server-Patches/0119-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-Server-Patches/0118-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From 042754e2e1e1efe8c4fe1c48423ff2d7528a778a Mon Sep 17 00:00:00 2001 +From e5e479460bd567fb43957512e40870585b5e1ff6 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/Spigot-Server-Patches/0120-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0119-Water-mobs-should-only-spawn-in-the-water.patch similarity index 94% rename from Spigot-Server-Patches/0120-Water-mobs-should-only-spawn-in-the-water.patch rename to Spigot-Server-Patches/0119-Water-mobs-should-only-spawn-in-the-water.patch index 1b9c3dd522..6abe47f876 100644 --- a/Spigot-Server-Patches/0120-Water-mobs-should-only-spawn-in-the-water.patch +++ b/Spigot-Server-Patches/0119-Water-mobs-should-only-spawn-in-the-water.patch @@ -1,4 +1,4 @@ -From 182eced389007c2a1bf636b77983bee4a9a5e687 Mon Sep 17 00:00:00 2001 +From 7ea77c7bbcea4714f13d0aaed96d3ca96fc56bac Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 14 Apr 2016 17:48:56 -0500 Subject: [PATCH] Water mobs should only spawn in the water diff --git a/Spigot-Server-Patches/0121-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0120-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch similarity index 97% rename from Spigot-Server-Patches/0121-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch rename to Spigot-Server-Patches/0120-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch index 3a77b94c54..bfb1950cd8 100644 --- a/Spigot-Server-Patches/0121-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch +++ b/Spigot-Server-Patches/0120-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch @@ -1,4 +1,4 @@ -From 0bf6e6d9533372e999b08ca7b4c714496c9c4ed4 Mon Sep 17 00:00:00 2001 +From 80459847413a5107bc062d6f65b2da71fdd32eac Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 14 Apr 2016 21:01:39 -0400 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic diff --git a/Spigot-Server-Patches/0122-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0121-Configurable-RCON-IP-address.patch similarity index 93% rename from Spigot-Server-Patches/0122-Configurable-RCON-IP-address.patch rename to Spigot-Server-Patches/0121-Configurable-RCON-IP-address.patch index 1930682107..3efac90d42 100644 --- a/Spigot-Server-Patches/0122-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0121-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From 6316e4cb845a5045a881450db207d68dc2f3550c Mon Sep 17 00:00:00 2001 +From 003148da08b283ba0b1696222927cd1c8fe77207 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address diff --git a/Spigot-Server-Patches/0123-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0122-Prevent-Fire-from-loading-chunks.patch similarity index 97% rename from Spigot-Server-Patches/0123-Prevent-Fire-from-loading-chunks.patch rename to Spigot-Server-Patches/0122-Prevent-Fire-from-loading-chunks.patch index 71d44da46d..f3923926b8 100644 --- a/Spigot-Server-Patches/0123-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0122-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From e3a566ee10a6d293e886d673f03a3652d854d7ef Mon Sep 17 00:00:00 2001 +From 8b872363b4ed115d482f83f4328fa444192dfe17 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks diff --git a/Spigot-Server-Patches/0124-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0123-Implement-PlayerLocaleChangeEvent.patch similarity index 97% rename from Spigot-Server-Patches/0124-Implement-PlayerLocaleChangeEvent.patch rename to Spigot-Server-Patches/0123-Implement-PlayerLocaleChangeEvent.patch index 239358a5a3..1d0a5c5f3f 100644 --- a/Spigot-Server-Patches/0124-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0123-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 08431e50cbf5dfd8f360139eb351c008e7c00a77 Mon Sep 17 00:00:00 2001 +From 99367ba5827ada166fb56b27aaad03f3ed4290db Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/Spigot-Server-Patches/0125-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0124-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 97% rename from Spigot-Server-Patches/0125-EntityRegainHealthEvent-isFastRegen-API.patch rename to Spigot-Server-Patches/0124-EntityRegainHealthEvent-isFastRegen-API.patch index 9c4b4c4399..f9bab020ee 100644 --- a/Spigot-Server-Patches/0125-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0124-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 52dd965b56ebb4753e78717444b08d25e29fa6a9 Mon Sep 17 00:00:00 2001 +From 21c7e1d110079977290a2966af83b112bce373a5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/Spigot-Server-Patches/0126-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0125-Add-ability-to-configure-frosted_ice-properties.patch similarity index 97% rename from Spigot-Server-Patches/0126-Add-ability-to-configure-frosted_ice-properties.patch rename to Spigot-Server-Patches/0125-Add-ability-to-configure-frosted_ice-properties.patch index 8d20b2f45a..18c82f1aad 100644 --- a/Spigot-Server-Patches/0126-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0125-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,4 +1,4 @@ -From 357350798adfbe53370efcf429e73b341a02f069 Mon Sep 17 00:00:00 2001 +From 301c48afe1476bca3793c13900cd0ee0e431d9f1 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/Spigot-Server-Patches/0127-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0126-Vehicle-Event-Cancellation-Changes.patch similarity index 98% rename from Spigot-Server-Patches/0127-Vehicle-Event-Cancellation-Changes.patch rename to Spigot-Server-Patches/0126-Vehicle-Event-Cancellation-Changes.patch index 174827df2a..3444d78258 100644 --- a/Spigot-Server-Patches/0127-Vehicle-Event-Cancellation-Changes.patch +++ b/Spigot-Server-Patches/0126-Vehicle-Event-Cancellation-Changes.patch @@ -1,4 +1,4 @@ -From b9113e6ba632a3c3bbe17f6b487ffb56132b80e7 Mon Sep 17 00:00:00 2001 +From 08a96c69d9c2893a37e6bd71b65f1c48096b8485 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 18:20:05 -0500 Subject: [PATCH] Vehicle Event Cancellation Changes diff --git a/Spigot-Server-Patches/0128-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0127-Arrow-pickup-rule-API.patch similarity index 96% rename from Spigot-Server-Patches/0128-Arrow-pickup-rule-API.patch rename to Spigot-Server-Patches/0127-Arrow-pickup-rule-API.patch index 68c74f91d1..d50f24fff6 100644 --- a/Spigot-Server-Patches/0128-Arrow-pickup-rule-API.patch +++ b/Spigot-Server-Patches/0127-Arrow-pickup-rule-API.patch @@ -1,4 +1,4 @@ -From ce322eaf0e78ed212d80c7dfe0e33c5fa105f6d4 Mon Sep 17 00:00:00 2001 +From d5f47de464e17bc91048e94aaf1de0b539729527 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 4 Mar 2016 03:16:11 -0500 Subject: [PATCH] Arrow pickup rule API diff --git a/Spigot-Server-Patches/0129-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0128-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch similarity index 97% rename from Spigot-Server-Patches/0129-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch rename to Spigot-Server-Patches/0128-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch index dcbb1deac9..8c16ca9b07 100644 --- a/Spigot-Server-Patches/0129-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch +++ b/Spigot-Server-Patches/0128-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch @@ -1,4 +1,4 @@ -From 072bddba8079cc680ff95f629c926103a8af486a Mon Sep 17 00:00:00 2001 +From 8c8623d2c519cc80308a33c53a1729667d3703fe Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 24 Apr 2016 19:49:33 -0500 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement diff --git a/Spigot-Server-Patches/0130-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0129-Improve-Minecraft-Hopper-Performance.patch similarity index 97% rename from Spigot-Server-Patches/0130-Improve-Minecraft-Hopper-Performance.patch rename to Spigot-Server-Patches/0129-Improve-Minecraft-Hopper-Performance.patch index 2f8cd0e321..75467d3816 100644 --- a/Spigot-Server-Patches/0130-Improve-Minecraft-Hopper-Performance.patch +++ b/Spigot-Server-Patches/0129-Improve-Minecraft-Hopper-Performance.patch @@ -1,4 +1,4 @@ -From 07e66bf9e7556e4982a2029b012475b4f6c5fbc7 Mon Sep 17 00:00:00 2001 +From 429958c34916bf78a6dadf07580c77dc6feef1a7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Improve Minecraft Hopper Performance diff --git a/Spigot-Server-Patches/0131-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0130-remove-null-possibility-for-getServer-singleton.patch similarity index 96% rename from Spigot-Server-Patches/0131-remove-null-possibility-for-getServer-singleton.patch rename to Spigot-Server-Patches/0130-remove-null-possibility-for-getServer-singleton.patch index be7b2312a2..babe8d0ed1 100644 --- a/Spigot-Server-Patches/0131-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0130-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From c7fc2d45d3bf02828cba7ebc49fde738d05268bc Mon Sep 17 00:00:00 2001 +From 920f7a5b371eba7af0aec239feb3f6142026da9c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton diff --git a/Spigot-Server-Patches/0132-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 98% rename from Spigot-Server-Patches/0132-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 014fcc35f7..ff38abde8b 100644 --- a/Spigot-Server-Patches/0132-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 0f6fb20f482b0f6bae8e1d4a4c70ff30592836b3 Mon Sep 17 00:00:00 2001 +From f46ff53dca8da104b071ce493c838a1c4f968bbf Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -48,7 +48,7 @@ index 370cb9c..91af48f 100644 Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b8fefb8..a18a3f6 100644 +index 948e459..ec03572 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1216,6 +1216,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0133-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0132-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 99% rename from Spigot-Server-Patches/0133-LootTable-API-Replenishable-Lootables-Feature.patch rename to Spigot-Server-Patches/0132-LootTable-API-Replenishable-Lootables-Feature.patch index 8f4e4b9901..e9045eb4ee 100644 --- a/Spigot-Server-Patches/0133-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0132-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 0960bacbacd9d02edd2c479ef2677e27c51b5822 Mon Sep 17 00:00:00 2001 +From db2393fe957ad48a95af27ef2fb0a1afb0489835 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature diff --git a/Spigot-Server-Patches/0134-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0133-Do-not-load-chunks-for-pathfinding.patch similarity index 92% rename from Spigot-Server-Patches/0134-Do-not-load-chunks-for-pathfinding.patch rename to Spigot-Server-Patches/0133-Do-not-load-chunks-for-pathfinding.patch index 8e45560ce8..fd75f81eae 100644 --- a/Spigot-Server-Patches/0134-Do-not-load-chunks-for-pathfinding.patch +++ b/Spigot-Server-Patches/0133-Do-not-load-chunks-for-pathfinding.patch @@ -1,4 +1,4 @@ -From 84977c4a270a63d85372e4d71f30ac1ff981a040 Mon Sep 17 00:00:00 2001 +From ffbc2adc678c6a312bbbe4a0339c09e2df31e4bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Jan 2016 00:13:19 -0500 Subject: [PATCH] Do not load chunks for pathfinding diff --git a/Spigot-Server-Patches/0135-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0134-Entity-Tracking-Improvements.patch similarity index 98% rename from Spigot-Server-Patches/0135-Entity-Tracking-Improvements.patch rename to Spigot-Server-Patches/0134-Entity-Tracking-Improvements.patch index 71d73206cd..9bd2f74884 100644 --- a/Spigot-Server-Patches/0135-Entity-Tracking-Improvements.patch +++ b/Spigot-Server-Patches/0134-Entity-Tracking-Improvements.patch @@ -1,4 +1,4 @@ -From 5db4f83d1537975e541f83fcc400b5c81323b28f Mon Sep 17 00:00:00 2001 +From 23fbb29c66bd4230c74d39d5e22f26a4c1855c98 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Jun 2013 01:24:00 -0400 Subject: [PATCH] Entity Tracking Improvements diff --git a/Spigot-Server-Patches/0136-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0135-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 96% rename from Spigot-Server-Patches/0136-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to Spigot-Server-Patches/0135-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index e1dbba4bae..9e8bfb9d23 100644 --- a/Spigot-Server-Patches/0136-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0135-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,4 +1,4 @@ -From 6092a6929b443e1ceca2337e038d2e05a6e9cdf1 Mon Sep 17 00:00:00 2001 +From f1569bcf73f70605748c582e26ba156b6590cba5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/Spigot-Server-Patches/0137-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0136-Do-not-mark-chunks-as-active-for-neighbor-updates.patch similarity index 97% rename from Spigot-Server-Patches/0137-Do-not-mark-chunks-as-active-for-neighbor-updates.patch rename to Spigot-Server-Patches/0136-Do-not-mark-chunks-as-active-for-neighbor-updates.patch index 92d89ab817..93346e4a81 100644 --- a/Spigot-Server-Patches/0137-Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/0136-Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -1,4 +1,4 @@ -From d926ee6cde591188f202d3ff4738eaeb221d4e02 Mon Sep 17 00:00:00 2001 +From b5b474513ed052e0f84f21e9847dd047c24c42b3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 01:55:17 -0400 Subject: [PATCH] Do not mark chunks as active for neighbor updates diff --git a/Spigot-Server-Patches/0138-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0137-Fix-Chunk-Unload-Queue-Issues.patch similarity index 96% rename from Spigot-Server-Patches/0138-Fix-Chunk-Unload-Queue-Issues.patch rename to Spigot-Server-Patches/0137-Fix-Chunk-Unload-Queue-Issues.patch index 0284195371..9d96167e59 100644 --- a/Spigot-Server-Patches/0138-Fix-Chunk-Unload-Queue-Issues.patch +++ b/Spigot-Server-Patches/0137-Fix-Chunk-Unload-Queue-Issues.patch @@ -1,4 +1,4 @@ -From d2a0928f85b5cda286ca017993c0ac4bd72edbfd Mon Sep 17 00:00:00 2001 +From abbb57231054c88533d9c6bc71a9c285f68e6796 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 02:03:56 -0400 Subject: [PATCH] Fix Chunk Unload Queue Issues diff --git a/Spigot-Server-Patches/0139-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0138-System-property-for-disabling-watchdoge.patch similarity index 93% rename from Spigot-Server-Patches/0139-System-property-for-disabling-watchdoge.patch rename to Spigot-Server-Patches/0138-System-property-for-disabling-watchdoge.patch index c8cf46539b..a396beb74c 100644 --- a/Spigot-Server-Patches/0139-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0138-System-property-for-disabling-watchdoge.patch @@ -1,4 +1,4 @@ -From ccd0b6b2684527b411ad2ee81d04f54649950653 Mon Sep 17 00:00:00 2001 +From fca52889e122cb2a7e1d30d4c731afc95e5fe003 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/Spigot-Server-Patches/0140-Optimize-EAR.patch b/Spigot-Server-Patches/0139-Optimize-EAR.patch similarity index 97% rename from Spigot-Server-Patches/0140-Optimize-EAR.patch rename to Spigot-Server-Patches/0139-Optimize-EAR.patch index 8b03c51ea8..d009bd2b09 100644 --- a/Spigot-Server-Patches/0140-Optimize-EAR.patch +++ b/Spigot-Server-Patches/0139-Optimize-EAR.patch @@ -1,4 +1,4 @@ -From baae6bcffe1507b731eb9665ecf00263e7b66cdb Mon Sep 17 00:00:00 2001 +From 3e6aa58cb66df97b3c7b25d993e4663547beb44e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Optimize EAR diff --git a/Spigot-Server-Patches/0141-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0140-Optimize-UserCache-Thread-Safe.patch similarity index 98% rename from Spigot-Server-Patches/0141-Optimize-UserCache-Thread-Safe.patch rename to Spigot-Server-Patches/0140-Optimize-UserCache-Thread-Safe.patch index 48fb517ff9..a273cbc02e 100644 --- a/Spigot-Server-Patches/0141-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0140-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From 9cc035507e52602c06dd0cbda7935091d5b74316 Mon Sep 17 00:00:00 2001 +From 8571493e3b678c1ca405585135fae9531db6e730 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe diff --git a/Spigot-Server-Patches/0142-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0141-Avoid-blocking-on-Network-Manager-creation.patch similarity index 97% rename from Spigot-Server-Patches/0142-Avoid-blocking-on-Network-Manager-creation.patch rename to Spigot-Server-Patches/0141-Avoid-blocking-on-Network-Manager-creation.patch index 918546d948..88df315e57 100644 --- a/Spigot-Server-Patches/0142-Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/0141-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From c588b430bfab3474b02c488ec2642b0e6b7a46d2 Mon Sep 17 00:00:00 2001 +From 3031261e1677d694e061cb2ec675db49bcce5485 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation diff --git a/Spigot-Server-Patches/0143-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0142-Optional-old-TNT-cannon-behaviors.patch similarity index 99% rename from Spigot-Server-Patches/0143-Optional-old-TNT-cannon-behaviors.patch rename to Spigot-Server-Patches/0142-Optional-old-TNT-cannon-behaviors.patch index 3bf8d9a9aa..aff558cd75 100644 --- a/Spigot-Server-Patches/0143-Optional-old-TNT-cannon-behaviors.patch +++ b/Spigot-Server-Patches/0142-Optional-old-TNT-cannon-behaviors.patch @@ -1,4 +1,4 @@ -From 00d7398a73ad247f545629e5cf38f6bed90cb4e4 Mon Sep 17 00:00:00 2001 +From afe40afde371d88195c7a5d2f027f6483961aa2c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional old TNT cannon behaviors diff --git a/Spigot-Server-Patches/0144-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0143-Faster-redstone-torch-rapid-clock-removal.patch similarity index 96% rename from Spigot-Server-Patches/0144-Faster-redstone-torch-rapid-clock-removal.patch rename to Spigot-Server-Patches/0143-Faster-redstone-torch-rapid-clock-removal.patch index 242905c6ad..ba02deee99 100644 --- a/Spigot-Server-Patches/0144-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0143-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From 7873041b5366f21e28f223cb43dc235c29a83609 Mon Sep 17 00:00:00 2001 +From b5d4ed058bc016b7cca1e61844e0b0448dcb38a8 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal diff --git a/Spigot-Server-Patches/0145-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0144-Ensure-Chunks-never-ever-load-async.patch similarity index 97% rename from Spigot-Server-Patches/0145-Ensure-Chunks-never-ever-load-async.patch rename to Spigot-Server-Patches/0144-Ensure-Chunks-never-ever-load-async.patch index a9fa5b85f8..4309d84232 100644 --- a/Spigot-Server-Patches/0145-Ensure-Chunks-never-ever-load-async.patch +++ b/Spigot-Server-Patches/0144-Ensure-Chunks-never-ever-load-async.patch @@ -1,4 +1,4 @@ -From be7f6fcbd5a50af9cbe9495f50192ab6f878b0c2 Mon Sep 17 00:00:00 2001 +From 1b21610eaf17642ea4a6646bf2a1f96d2b7a8fb2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 27 May 2016 21:41:26 -0400 Subject: [PATCH] Ensure Chunks never ever load async diff --git a/Spigot-Server-Patches/0146-Add-server-name-parameter.patch b/Spigot-Server-Patches/0145-Add-server-name-parameter.patch similarity index 93% rename from Spigot-Server-Patches/0146-Add-server-name-parameter.patch rename to Spigot-Server-Patches/0145-Add-server-name-parameter.patch index ad76c6891c..b8cb3519f6 100644 --- a/Spigot-Server-Patches/0146-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0145-Add-server-name-parameter.patch @@ -1,4 +1,4 @@ -From e0ddf29d3ebe2772a89b2dd583e94c98cbbfe68e Mon Sep 17 00:00:00 2001 +From c48bda8426ca36a49183e7ddac0a2fb4390390e6 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter diff --git a/Spigot-Server-Patches/0147-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0146-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 97% rename from Spigot-Server-Patches/0147-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to Spigot-Server-Patches/0146-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 59551221cc..8fdf4e4b17 100644 --- a/Spigot-Server-Patches/0147-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0146-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From a65a78f663f0651a98aa19cbdd968f2a9ca5e87c Mon Sep 17 00:00:00 2001 +From ea1c3932b75a5b0deb939bddb7a421265a1ee915 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world diff --git a/Spigot-Server-Patches/0148-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0147-Fix-FallingBlocks-being-stuck-on-fences.patch similarity index 98% rename from Spigot-Server-Patches/0148-Fix-FallingBlocks-being-stuck-on-fences.patch rename to Spigot-Server-Patches/0147-Fix-FallingBlocks-being-stuck-on-fences.patch index 76b06130a3..a3497da159 100644 --- a/Spigot-Server-Patches/0148-Fix-FallingBlocks-being-stuck-on-fences.patch +++ b/Spigot-Server-Patches/0147-Fix-FallingBlocks-being-stuck-on-fences.patch @@ -1,4 +1,4 @@ -From c26e577f4889a970d2cbd8f9f10ddd4bbb301fa3 Mon Sep 17 00:00:00 2001 +From 073e8dab73fd83b045137ae4328389343ce66fc2 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Fri, 3 Jun 2016 23:13:39 +0200 Subject: [PATCH] Fix FallingBlocks being stuck on fences diff --git a/Spigot-Server-Patches/0149-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0148-Make-entities-look-for-hoppers.patch similarity index 99% rename from Spigot-Server-Patches/0149-Make-entities-look-for-hoppers.patch rename to Spigot-Server-Patches/0148-Make-entities-look-for-hoppers.patch index 479bc2f84b..2dc159e1cb 100644 --- a/Spigot-Server-Patches/0149-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0148-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From a7eb52dbae3e2378a094cdd70304b7e2c3c3dffa Mon Sep 17 00:00:00 2001 +From a582afd2c6b4ee60c8fc5f15effdacb98bb50bdf Mon Sep 17 00:00:00 2001 From: Techcable Date: Sat, 18 Jun 2016 01:01:37 -0500 Subject: [PATCH] Make entities look for hoppers diff --git a/Spigot-Server-Patches/0150-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0149-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 99% rename from Spigot-Server-Patches/0150-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to Spigot-Server-Patches/0149-Delay-Chunk-Unloads-based-on-Player-Movement.patch index cbd84b9369..38f2fbb23e 100644 --- a/Spigot-Server-Patches/0150-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0149-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 84601041d42d274955a08deea4f7b069ccb07dda Mon Sep 17 00:00:00 2001 +From b263076a8df188ebeb031782d0e2496865b3a3ab Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement diff --git a/Spigot-Server-Patches/0151-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0150-Toggleable-Elytra-Wall-Damage.patch similarity index 96% rename from Spigot-Server-Patches/0151-Toggleable-Elytra-Wall-Damage.patch rename to Spigot-Server-Patches/0150-Toggleable-Elytra-Wall-Damage.patch index 969515be3a..bf5b4bfe4b 100644 --- a/Spigot-Server-Patches/0151-Toggleable-Elytra-Wall-Damage.patch +++ b/Spigot-Server-Patches/0150-Toggleable-Elytra-Wall-Damage.patch @@ -1,4 +1,4 @@ -From 2a76c1435b1a5a3f30fdbc8277df3aae5703330b Mon Sep 17 00:00:00 2001 +From 7a4e4543459cf3c2cc1c08cc49c60be4ee384c26 Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Sat, 18 Jun 2016 23:13:59 -0700 Subject: [PATCH] Toggleable Elytra Wall Damage diff --git a/Spigot-Server-Patches/0152-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0151-Fix-Double-World-Add-issues.patch similarity index 95% rename from Spigot-Server-Patches/0152-Fix-Double-World-Add-issues.patch rename to Spigot-Server-Patches/0151-Fix-Double-World-Add-issues.patch index feb8451765..a035495c56 100644 --- a/Spigot-Server-Patches/0152-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0151-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From 80cc890650fe88d381a659ed551d6fdf47978d54 Mon Sep 17 00:00:00 2001 +From 3319f24b69ed6fac4f653727251bea9fbe11d8b1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -21,7 +21,7 @@ index e2dd95b..ff7b406 100644 Iterator iterator = entity.bx().iterator(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a18a3f6..b7c4e07 100644 +index ec03572..a349f19 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1098,6 +1098,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0153-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0152-Fix-Old-Sign-Conversion.patch similarity index 98% rename from Spigot-Server-Patches/0153-Fix-Old-Sign-Conversion.patch rename to Spigot-Server-Patches/0152-Fix-Old-Sign-Conversion.patch index 0513338ae1..fbc6e4357f 100644 --- a/Spigot-Server-Patches/0153-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0152-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From d215ca6808f38cb7dfa31591393e1afb0d8c6a35 Mon Sep 17 00:00:00 2001 +From 947accab1055de16aa50071129c49ad660672491 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion diff --git a/Spigot-Server-Patches/0154-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0153-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 93% rename from Spigot-Server-Patches/0154-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to Spigot-Server-Patches/0153-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index 7f1cc99c8d..3f60b9774c 100644 --- a/Spigot-Server-Patches/0154-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0153-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,4 +1,4 @@ -From 49bdee5275cd8950f35be0796a3469c8282919ae Mon Sep 17 00:00:00 2001 +From de73581742fc9d712a3678771c7ac2a3a5209afd Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/Spigot-Server-Patches/0155-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0154-More-informative-vehicle-moved-wrongly-message.patch similarity index 94% rename from Spigot-Server-Patches/0155-More-informative-vehicle-moved-wrongly-message.patch rename to Spigot-Server-Patches/0154-More-informative-vehicle-moved-wrongly-message.patch index cfc6ed770b..a1b6e362aa 100644 --- a/Spigot-Server-Patches/0155-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0154-More-informative-vehicle-moved-wrongly-message.patch @@ -1,4 +1,4 @@ -From e8cc90238708d5eeeb9e2885e4c2e12138a8d354 Mon Sep 17 00:00:00 2001 +From 2975f17e0c9b0cbc6dcf8e62ee5a1ef9feedeb73 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message diff --git a/Spigot-Server-Patches/0156-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0155-Re-track-players-that-dismount-from-other-players.patch similarity index 94% rename from Spigot-Server-Patches/0156-Re-track-players-that-dismount-from-other-players.patch rename to Spigot-Server-Patches/0155-Re-track-players-that-dismount-from-other-players.patch index 2889dde013..5a1373f2f7 100644 --- a/Spigot-Server-Patches/0156-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0155-Re-track-players-that-dismount-from-other-players.patch @@ -1,4 +1,4 @@ -From f0ce8613766ec872134d1a67b3bb0dd08d3f1555 Mon Sep 17 00:00:00 2001 +From 65fe44f929ec83d9ace94054c2ea9b4fea7f7290 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/Spigot-Server-Patches/0157-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0156-Add-setting-for-proxy-online-mode-status.patch similarity index 97% rename from Spigot-Server-Patches/0157-Add-setting-for-proxy-online-mode-status.patch rename to Spigot-Server-Patches/0156-Add-setting-for-proxy-online-mode-status.patch index ef3b0b756f..a3a7bb86d3 100644 --- a/Spigot-Server-Patches/0157-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0156-Add-setting-for-proxy-online-mode-status.patch @@ -1,4 +1,4 @@ -From 19700e1fb94bf0116f33ca99906c7996bcf03989 Mon Sep 17 00:00:00 2001 +From 78094035d641f06c1577126fe0a5e28101a82de4 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status diff --git a/Spigot-Server-Patches/0158-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0157-Optimise-BlockStateEnum-hashCode-and-equals.patch similarity index 97% rename from Spigot-Server-Patches/0158-Optimise-BlockStateEnum-hashCode-and-equals.patch rename to Spigot-Server-Patches/0157-Optimise-BlockStateEnum-hashCode-and-equals.patch index dc386b159c..1fc83f86bb 100644 --- a/Spigot-Server-Patches/0158-Optimise-BlockStateEnum-hashCode-and-equals.patch +++ b/Spigot-Server-Patches/0157-Optimise-BlockStateEnum-hashCode-and-equals.patch @@ -1,4 +1,4 @@ -From b6dbc63e8c4a6ef4bb026c56768b50ba1d0bebbd Mon Sep 17 00:00:00 2001 +From b36278d8482f8e2ad609e67966a8acba61d90409 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals diff --git a/Spigot-Server-Patches/0159-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0158-Disable-ticking-of-snow-blocks.patch similarity index 94% rename from Spigot-Server-Patches/0159-Disable-ticking-of-snow-blocks.patch rename to Spigot-Server-Patches/0158-Disable-ticking-of-snow-blocks.patch index a0c5e84cd8..5d40597634 100644 --- a/Spigot-Server-Patches/0159-Disable-ticking-of-snow-blocks.patch +++ b/Spigot-Server-Patches/0158-Disable-ticking-of-snow-blocks.patch @@ -1,4 +1,4 @@ -From ba26de0a9ca21cdbfacf6dea0884cb88e8144020 Mon Sep 17 00:00:00 2001 +From 3f339afac842c6557f2d5413e65520cf7f1a834f Mon Sep 17 00:00:00 2001 From: killme Date: Tue, 30 Aug 2016 16:39:48 +0200 Subject: [PATCH] Disable ticking of snow blocks diff --git a/Spigot-Server-Patches/0160-Convert-new-health-to-a-float-during-set.patch b/Spigot-Server-Patches/0159-Convert-new-health-to-a-float-during-set.patch similarity index 94% rename from Spigot-Server-Patches/0160-Convert-new-health-to-a-float-during-set.patch rename to Spigot-Server-Patches/0159-Convert-new-health-to-a-float-during-set.patch index 0bfd9efc18..348890297f 100644 --- a/Spigot-Server-Patches/0160-Convert-new-health-to-a-float-during-set.patch +++ b/Spigot-Server-Patches/0159-Convert-new-health-to-a-float-during-set.patch @@ -1,4 +1,4 @@ -From fabb9366afe8e8558bb54cfc1076846a4332c612 Mon Sep 17 00:00:00 2001 +From 4c2a8f6a654bef3d63c3b05fb00bee8d4008fc5b Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 1 Sep 2016 09:51:31 +0000 Subject: [PATCH] Convert new health to a float during set diff --git a/Spigot-Server-Patches/0161-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0160-Fix-AIOOBE-in-inventory-handling.patch similarity index 94% rename from Spigot-Server-Patches/0161-Fix-AIOOBE-in-inventory-handling.patch rename to Spigot-Server-Patches/0160-Fix-AIOOBE-in-inventory-handling.patch index 149089084a..29a8ab6555 100644 --- a/Spigot-Server-Patches/0161-Fix-AIOOBE-in-inventory-handling.patch +++ b/Spigot-Server-Patches/0160-Fix-AIOOBE-in-inventory-handling.patch @@ -1,4 +1,4 @@ -From ed4a6c8cfc33ea7aaed798d5399f579d3c4bf66b Mon Sep 17 00:00:00 2001 +From 757065596779575a761dbef641c6681137cfd1ac Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sun, 4 Sep 2016 16:35:43 -0500 Subject: [PATCH] Fix AIOOBE in inventory handling diff --git a/Spigot-Server-Patches/0162-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0161-Configurable-packet-in-spam-threshold.patch similarity index 97% rename from Spigot-Server-Patches/0162-Configurable-packet-in-spam-threshold.patch rename to Spigot-Server-Patches/0161-Configurable-packet-in-spam-threshold.patch index ee96f1f05b..ccb442f9a8 100644 --- a/Spigot-Server-Patches/0162-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0161-Configurable-packet-in-spam-threshold.patch @@ -1,4 +1,4 @@ -From 4aa83413120d7846fd492c18c3b6d006dcd69d40 Mon Sep 17 00:00:00 2001 +From 52365310cbd9ae56ee0c8d3c2e1d982c5fb6cb54 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold diff --git a/Spigot-Server-Patches/0163-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0162-Configurable-flying-kick-messages.patch similarity index 97% rename from Spigot-Server-Patches/0163-Configurable-flying-kick-messages.patch rename to Spigot-Server-Patches/0162-Configurable-flying-kick-messages.patch index 5e19c52cf0..0929bb59a1 100644 --- a/Spigot-Server-Patches/0163-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0162-Configurable-flying-kick-messages.patch @@ -1,4 +1,4 @@ -From a297d9ece693ba2bb45f011e1432531a6c03b627 Mon Sep 17 00:00:00 2001 +From b98dae283d6664e510c3a228773269f0fe35ceee Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages diff --git a/Spigot-Server-Patches/0164-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0163-Auto-Save-Improvements.patch similarity index 99% rename from Spigot-Server-Patches/0164-Auto-Save-Improvements.patch rename to Spigot-Server-Patches/0163-Auto-Save-Improvements.patch index 4d085356bc..f03f8cb70c 100644 --- a/Spigot-Server-Patches/0164-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0163-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From 850c07bad704068a851f429350b6242bb2e7db32 Mon Sep 17 00:00:00 2001 +From f6f085b91684ff9af51b4eda4e829176022473dd Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements diff --git a/Spigot-Server-Patches/0165-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch similarity index 91% rename from Spigot-Server-Patches/0165-Chunk-registration-fixes.patch rename to Spigot-Server-Patches/0164-Chunk-registration-fixes.patch index b2b91bd743..63ad7baa33 100644 --- a/Spigot-Server-Patches/0165-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 0a20481608c409a59af7eef5b70d127edab08a4f Mon Sep 17 00:00:00 2001 +From aeb95ccd8be310d368a73b4c335d49c82f39a7b8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b7c4e07..e7ae4c7 100644 +index a349f19..cd127e9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1783,7 +1783,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0166-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0165-Remove-FishingHook-reference-on-Craft-Entity-removal.patch similarity index 93% rename from Spigot-Server-Patches/0166-Remove-FishingHook-reference-on-Craft-Entity-removal.patch rename to Spigot-Server-Patches/0165-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 752db9a02e..5adb193b6b 100644 --- a/Spigot-Server-Patches/0166-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0165-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,4 +1,4 @@ -From 0542654c0122702d9a18649a3c3d79c2b9d24a65 Mon Sep 17 00:00:00 2001 +From 062823349d1c7c2d979bc1dd58c555d31c3281cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Jun 2016 00:17:23 -0400 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal diff --git a/Spigot-Server-Patches/0167-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0166-Auto-fix-bad-Y-levels-on-player-login.patch similarity index 92% rename from Spigot-Server-Patches/0167-Auto-fix-bad-Y-levels-on-player-login.patch rename to Spigot-Server-Patches/0166-Auto-fix-bad-Y-levels-on-player-login.patch index ce2fcd6fb7..d9976c108d 100644 --- a/Spigot-Server-Patches/0167-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0166-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From a96b37507762942b172e68b0e33c2fd4edcada4e Mon Sep 17 00:00:00 2001 +From 975d1e30b6bc0a7822d57b05e674ac1e1c9970db Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login diff --git a/Spigot-Server-Patches/0168-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0167-Raise-string-limit-for-packet-serialization.patch similarity index 95% rename from Spigot-Server-Patches/0168-Raise-string-limit-for-packet-serialization.patch rename to Spigot-Server-Patches/0167-Raise-string-limit-for-packet-serialization.patch index 370c146d00..0d25648a13 100644 --- a/Spigot-Server-Patches/0168-Raise-string-limit-for-packet-serialization.patch +++ b/Spigot-Server-Patches/0167-Raise-string-limit-for-packet-serialization.patch @@ -1,4 +1,4 @@ -From d69d28d4abefe283853847af7e2707eb10139084 Mon Sep 17 00:00:00 2001 +From bf0f64529fc9a67c460a0e9d7b8a792f6c64cd67 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:54:20 -0400 Subject: [PATCH] Raise string limit for packet serialization diff --git a/Spigot-Server-Patches/0169-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0168-Disable-Vanilla-Chunk-GC.patch similarity index 95% rename from Spigot-Server-Patches/0169-Disable-Vanilla-Chunk-GC.patch rename to Spigot-Server-Patches/0168-Disable-Vanilla-Chunk-GC.patch index 877faabd9a..4e9cb4b9c6 100644 --- a/Spigot-Server-Patches/0169-Disable-Vanilla-Chunk-GC.patch +++ b/Spigot-Server-Patches/0168-Disable-Vanilla-Chunk-GC.patch @@ -1,4 +1,4 @@ -From 4af5d5b07b603fd1bb03d7d3c5b06846948d9e30 Mon Sep 17 00:00:00 2001 +From 86471e6b7d50c7eaede6b71e0a41a5db85f796c1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Sep 2016 01:51:30 -0400 Subject: [PATCH] Disable Vanilla Chunk GC diff --git a/Spigot-Server-Patches/0170-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0169-Option-to-remove-corrupt-tile-entities.patch similarity index 96% rename from Spigot-Server-Patches/0170-Option-to-remove-corrupt-tile-entities.patch rename to Spigot-Server-Patches/0169-Option-to-remove-corrupt-tile-entities.patch index 6c396d4d05..be90bb9baa 100644 --- a/Spigot-Server-Patches/0170-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0169-Option-to-remove-corrupt-tile-entities.patch @@ -1,4 +1,4 @@ -From d52728bb4d71f2069314213896b745c729848c2b Mon Sep 17 00:00:00 2001 +From 52bcd237dd2f33a1d95ad2374913ac47072c48ea Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities diff --git a/Spigot-Server-Patches/0171-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0170-Add-EntityZapEvent.patch similarity index 98% rename from Spigot-Server-Patches/0171-Add-EntityZapEvent.patch rename to Spigot-Server-Patches/0170-Add-EntityZapEvent.patch index 5a559a7c7a..7192087fbc 100644 --- a/Spigot-Server-Patches/0171-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0170-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 032b7db5cf8f34d301a90bac95c812edcfbea26a Mon Sep 17 00:00:00 2001 +From e59da3c1ae54fc9575a8fe78b4e2e02911ef4aaf Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent diff --git a/Spigot-Server-Patches/0172-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0171-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 96% rename from Spigot-Server-Patches/0172-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to Spigot-Server-Patches/0171-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 9b81a1762e..8ce98d0294 100644 --- a/Spigot-Server-Patches/0172-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0171-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 6de9374b33d41a9335bd667efdcd3dd4dec39516 Mon Sep 17 00:00:00 2001 +From 4f4987f6b528ad216c6333f56420bea5c6f64ebd Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things diff --git a/Spigot-Server-Patches/0173-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0172-Prevent-Auto-Save-if-Save-Queue-is-full.patch similarity index 98% rename from Spigot-Server-Patches/0173-Prevent-Auto-Save-if-Save-Queue-is-full.patch rename to Spigot-Server-Patches/0172-Prevent-Auto-Save-if-Save-Queue-is-full.patch index 2a3e7bbb76..4dbc13c12e 100644 --- a/Spigot-Server-Patches/0173-Prevent-Auto-Save-if-Save-Queue-is-full.patch +++ b/Spigot-Server-Patches/0172-Prevent-Auto-Save-if-Save-Queue-is-full.patch @@ -1,4 +1,4 @@ -From 591dfc50062fc73514857eba53676054a11cd56c Mon Sep 17 00:00:00 2001 +From 1d460293480cc0ff1c566c76030cb785237c6558 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 21:52:22 -0400 Subject: [PATCH] Prevent Auto Save if Save Queue is full diff --git a/Spigot-Server-Patches/0174-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0173-Chunk-Save-Stats-Debug-Option.patch similarity index 98% rename from Spigot-Server-Patches/0174-Chunk-Save-Stats-Debug-Option.patch rename to Spigot-Server-Patches/0173-Chunk-Save-Stats-Debug-Option.patch index 325dc49674..5958be9a98 100644 --- a/Spigot-Server-Patches/0174-Chunk-Save-Stats-Debug-Option.patch +++ b/Spigot-Server-Patches/0173-Chunk-Save-Stats-Debug-Option.patch @@ -1,4 +1,4 @@ -From e3488f09522735e340e2a58b0a46183405970823 Mon Sep 17 00:00:00 2001 +From dfe1497fc2ac075ba6d29fecdabe9c044e2be997 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Nov 2016 02:12:10 -0400 Subject: [PATCH] Chunk Save Stats Debug Option diff --git a/Spigot-Server-Patches/0175-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0174-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 97% rename from Spigot-Server-Patches/0175-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to Spigot-Server-Patches/0174-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index f2ad892a17..d7c53f361a 100644 --- a/Spigot-Server-Patches/0175-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0174-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,4 +1,4 @@ -From 756ed4959a2b41d42001b3083e1296532eff6b67 Mon Sep 17 00:00:00 2001 +From d123edc59a7c7b62a20d7aeaa292b0e422806888 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items diff --git a/Spigot-Server-Patches/0176-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0175-Cache-user-authenticator-threads.patch similarity index 97% rename from Spigot-Server-Patches/0176-Cache-user-authenticator-threads.patch rename to Spigot-Server-Patches/0175-Cache-user-authenticator-threads.patch index fe6d1d5df7..0b92268d19 100644 --- a/Spigot-Server-Patches/0176-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0175-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From 672eb08f8b066ea26d9bebd60159d95ae77bfd62 Mon Sep 17 00:00:00 2001 +From b5dc2c592ec57e8974173e45eced1a439344d6ae Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads diff --git a/Spigot-Server-Patches/0177-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0176-Optimize-Network-Queue.patch similarity index 93% rename from Spigot-Server-Patches/0177-Optimize-Network-Queue.patch rename to Spigot-Server-Patches/0176-Optimize-Network-Queue.patch index 0c3119d524..091f8c9091 100644 --- a/Spigot-Server-Patches/0177-Optimize-Network-Queue.patch +++ b/Spigot-Server-Patches/0176-Optimize-Network-Queue.patch @@ -1,4 +1,4 @@ -From cdfc40dc5ede1164bc57a15488eea8db5b1f4ba3 Mon Sep 17 00:00:00 2001 +From 3fba45b9eb3981b09236148fdabed903902441c6 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:54:56 -0500 Subject: [PATCH] Optimize Network Queue diff --git a/Spigot-Server-Patches/0178-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0177-Optimise-NetworkManager.patch similarity index 98% rename from Spigot-Server-Patches/0178-Optimise-NetworkManager.patch rename to Spigot-Server-Patches/0177-Optimise-NetworkManager.patch index de8ec3a7bc..6c3e2cac2e 100644 --- a/Spigot-Server-Patches/0178-Optimise-NetworkManager.patch +++ b/Spigot-Server-Patches/0177-Optimise-NetworkManager.patch @@ -1,4 +1,4 @@ -From e25bf1475aa5d939a70fc68b7822b6d39c20bec6 Mon Sep 17 00:00:00 2001 +From 309c65ed4c85fcef396a9760689b73fed7f3d30f Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 20:35:05 +0000 Subject: [PATCH] Optimise NetworkManager diff --git a/Spigot-Server-Patches/0179-Optimise-removeQueue.patch b/Spigot-Server-Patches/0178-Optimise-removeQueue.patch similarity index 97% rename from Spigot-Server-Patches/0179-Optimise-removeQueue.patch rename to Spigot-Server-Patches/0178-Optimise-removeQueue.patch index 5e52678cf5..40f29d21bb 100644 --- a/Spigot-Server-Patches/0179-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0178-Optimise-removeQueue.patch @@ -1,4 +1,4 @@ -From 3adb456f88d312da4a666630a0aa28698d200905 Mon Sep 17 00:00:00 2001 +From c09a7a1252ec41640f7b2db574506c408386a41d Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/Spigot-Server-Patches/0180-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0179-Allow-Reloading-of-Command-Aliases.patch similarity index 94% rename from Spigot-Server-Patches/0180-Allow-Reloading-of-Command-Aliases.patch rename to Spigot-Server-Patches/0179-Allow-Reloading-of-Command-Aliases.patch index 436a0bfdb5..353b861672 100644 --- a/Spigot-Server-Patches/0180-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0179-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 120d8ec03fdcb9cfc95827a280f85bc37ccfd375 Mon Sep 17 00:00:00 2001 +From 8d7a0fcafd8d44f7f731f8692c4604b5eaaeb09e Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases diff --git a/Spigot-Server-Patches/0181-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0180-Add-source-to-PlayerExpChangeEvent.patch similarity index 97% rename from Spigot-Server-Patches/0181-Add-source-to-PlayerExpChangeEvent.patch rename to Spigot-Server-Patches/0180-Add-source-to-PlayerExpChangeEvent.patch index 7814e1429c..a72308d0b9 100644 --- a/Spigot-Server-Patches/0181-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0180-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From 6b5f9a58181a07e62b972e797c3f23c78a4cb662 Mon Sep 17 00:00:00 2001 +From 6425ecdf2a259ee782ecf49027cb3e5cf17c74fb Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/Spigot-Server-Patches/0182-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0181-Speedup-BlockPos-by-fixing-inlining.patch similarity index 99% rename from Spigot-Server-Patches/0182-Speedup-BlockPos-by-fixing-inlining.patch rename to Spigot-Server-Patches/0181-Speedup-BlockPos-by-fixing-inlining.patch index 3be4bcb515..4c22e1e93c 100644 --- a/Spigot-Server-Patches/0182-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0181-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From e6ca9b9355a59603d65f824ac1c396844ad87f46 Mon Sep 17 00:00:00 2001 +From 87622de2cffd52a880392eb3c7c861c7d07f1023 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 30 Nov 2016 20:56:58 -0600 Subject: [PATCH] Speedup BlockPos by fixing inlining diff --git a/Spigot-Server-Patches/0183-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0182-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 89% rename from Spigot-Server-Patches/0183-Optimize-World.isLoaded-BlockPosition-Z.patch rename to Spigot-Server-Patches/0182-Optimize-World.isLoaded-BlockPosition-Z.patch index 83a7a6341b..57561a8b92 100644 --- a/Spigot-Server-Patches/0183-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0182-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From e0b5a13ae87be78291e42f80d3520108c7c3e8e4 Mon Sep 17 00:00:00 2001 +From 1dc1dbf8e9df3b78ca88142163f86d32db46574b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Dec 2016 00:11:43 -0500 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e7ae4c7..51e05f4 100644 +index cd127e9..d8c8ca0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -286,7 +286,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0184-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0183-Don-t-let-fishinghooks-use-portals.patch similarity index 93% rename from Spigot-Server-Patches/0184-Don-t-let-fishinghooks-use-portals.patch rename to Spigot-Server-Patches/0183-Don-t-let-fishinghooks-use-portals.patch index 05dd7c1a56..5d43f985e2 100644 --- a/Spigot-Server-Patches/0184-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0183-Don-t-let-fishinghooks-use-portals.patch @@ -1,4 +1,4 @@ -From 7c1bdce92a95818298f913731cb8ee840e990c39 Mon Sep 17 00:00:00 2001 +From 930615771bf5693250b512cc194c239d69198b08 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:19 -0600 Subject: [PATCH] Don't let fishinghooks use portals @@ -18,7 +18,7 @@ index 7de4b5b..79bbc8e 100644 public int dimension; protected BlockPosition an; diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 7771243..64e89e7 100644 +index 96c3d66..5a8ab54 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -175,6 +175,12 @@ public class EntityFishingHook extends Entity { diff --git a/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch new file mode 100644 index 0000000000..6b0c758021 --- /dev/null +++ b/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch @@ -0,0 +1,111 @@ +From 231be5bb31831390a32c97235961ec0c7146a123 Mon Sep 17 00:00:00 2001 +From: Techcable +Date: Fri, 16 Dec 2016 21:25:39 -0600 +Subject: [PATCH] Add ProjectileCollideEvent + + +diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java +index 4b01cc0..76acbcd 100644 +--- a/src/main/java/net/minecraft/server/EntityArrow.java ++++ b/src/main/java/net/minecraft/server/EntityArrow.java +@@ -190,6 +191,15 @@ public abstract class EntityArrow extends Entity implements IProjectile { + } + } + ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + this.a(movingobjectposition); + } +diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java +index 789de85..d5c9d24 100644 +--- a/src/main/java/net/minecraft/server/EntityFireball.java ++++ b/src/main/java/net/minecraft/server/EntityFireball.java +@@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity { + ++this.f; + MovingObjectPosition movingobjectposition = ProjectileHelper.a(this, true, this.f >= 25, this.shooter); + ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + this.a(movingobjectposition); + +diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java +index 5a8ab54..9e09b14 100644 +--- a/src/main/java/net/minecraft/server/EntityFishingHook.java ++++ b/src/main/java/net/minecraft/server/EntityFishingHook.java +@@ -230,6 +230,16 @@ public class EntityFishingHook extends Entity { + + vec3d = new Vec3D(this.locX, this.locY, this.locZ); + vec3d1 = new Vec3D(this.locX + this.motX, this.locY + this.motY, this.locZ + this.motZ); ++ ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z); + } +diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java +index 28718d5..e00ce38 100644 +--- a/src/main/java/net/minecraft/server/EntityProjectile.java ++++ b/src/main/java/net/minecraft/server/EntityProjectile.java +@@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile { + movingobjectposition = new MovingObjectPosition(entity); + } + ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) { + this.e(movingobjectposition.a()); +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index 75b0149..3e54f44 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -792,6 +792,16 @@ public class CraftEventFactory { + return CraftItemStack.asNMSCopy(bitem); + } + ++ // Paper start ++ public static com.destroystokyo.paper.event.entity.ProjectileCollideEvent callProjectileCollideEvent(Entity entity, MovingObjectPosition position) { ++ Projectile projectile = (Projectile) entity.getBukkitEntity(); ++ org.bukkit.entity.Entity collided = position.entity.getBukkitEntity(); ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); ++ Bukkit.getPluginManager().callEvent(event); ++ return event; ++ } ++ // Paper end ++ + public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) { + Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); + ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); +-- +2.9.3 + diff --git a/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch new file mode 100644 index 0000000000..da715b9e1b --- /dev/null +++ b/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch @@ -0,0 +1,87 @@ +From 619ac230c0fd18950c98bbc54b0076607ee41af5 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Fri, 16 Dec 2016 22:10:35 -0600 +Subject: [PATCH] Vanished players don't have rights + + +diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java +index eb32871..a380e61 100644 +--- a/src/main/java/net/minecraft/server/ItemBlock.java ++++ b/src/main/java/net/minecraft/server/ItemBlock.java +@@ -20,7 +20,7 @@ public class ItemBlock extends Item { + + ItemStack itemstack = entityhuman.b(enumhand); + +- if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, (Entity) null)) { ++ if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, entityhuman)) { // Paper - Pass entityhuman instead of null + int i = this.filterData(itemstack.getData()); + IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index d8c8ca0..70140ce 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -1819,6 +1819,33 @@ public abstract class World implements IBlockAccess { + return this.a(axisalignedbb, (Entity) null); + } + ++ // Paper start - Based on method below ++ /** ++ * @param axisalignedbb area to search within ++ * @param entity causing the action ex. block placer ++ * @return if there are no visible players colliding ++ */ ++ public boolean checkNoVisiblePlayerCollisions(AxisAlignedBB axisalignedbb, @Nullable Entity entity) { ++ List list = this.getEntities((Entity) null, axisalignedbb); ++ ++ for (int i = 0; i < list.size(); ++i) { ++ Entity entity1 = (Entity) list.get(i); ++ ++ if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) { ++ if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) { ++ continue; ++ } ++ } ++ ++ if (!entity1.dead && entity1.i) { ++ return false; ++ } ++ } ++ ++ return true; ++ } ++ // Paper end ++ + public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) { + List list = this.getEntities((Entity) null, axisalignedbb); + +@@ -2703,7 +2730,7 @@ public abstract class World implements IBlockAccess { + AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().c(this, blockposition); + + // CraftBukkit start - store default return +- boolean defaultReturn = axisalignedbb != Block.k && !this.a(axisalignedbb.a(blockposition), entity) ? false : (iblockdata.getMaterial() == Material.ORIENTABLE && block == Blocks.ANVIL ? true : iblockdata.getMaterial().isReplaceable() && block.canPlace(this, blockposition, enumdirection)); ++ boolean defaultReturn = axisalignedbb != Block.k && !this.checkNoVisiblePlayerCollisions(axisalignedbb.a(blockposition), entity) ? false : (iblockdata.getMaterial() == Material.ORIENTABLE && block == Blocks.ANVIL ? true : iblockdata.getMaterial().isReplaceable() && block.canPlace(this, blockposition, enumdirection)); // Paper - Use our entity search + BlockCanBuildEvent event = new BlockCanBuildEvent(this.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftMagicNumbers.getId(block), defaultReturn); + this.getServer().getPluginManager().callEvent(event); + +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index 3e54f44..b19c74b 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -797,6 +797,13 @@ public class CraftEventFactory { + Projectile projectile = (Projectile) entity.getBukkitEntity(); + org.bukkit.entity.Entity collided = position.entity.getBukkitEntity(); + com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); ++ ++ if (projectile.getShooter() instanceof Player && collided instanceof Player) { ++ if (!((Player) projectile.getShooter()).canSee((Player) collided)) { ++ event.setCancelled(true); ++ } ++ } ++ + Bukkit.getPluginManager().callEvent(event); + return event; + } +-- +2.9.3 +