diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 8aeb63d776..97480147b5 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,14 +1,14 @@ -From ffc2ee319da1ad8b57a13d9aa0dd8711ce6ee4ad Mon Sep 17 00:00:00 2001 +From 02d5007d081bde67f58dac3e04ce1df9e70ff9b4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 00d8019d9..148c322bc 100644 +index 23fde9622..a613cf963 100644 --- a/pom.xml +++ b/pom.xml -@@ -3,38 +3,37 @@ +@@ -3,33 +3,28 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -53,7 +53,9 @@ index 00d8019d9..148c322bc 100644 - - - + com.google.guava -@@ -101,15 +107,12 @@ +@@ -107,15 +113,12 @@ @@ -95,7 +97,7 @@ index 00d8019d9..148c322bc 100644 -@@ -144,6 +147,7 @@ +@@ -150,6 +153,7 @@ diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index b8fd2c7232..3af13f851c 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -1,4 +1,4 @@ -From 82f0740953bd81ddf86eff39d3bfba0aa4163cf2 Mon Sep 17 00:00:00 2001 +From af5c59b98dedbd732043a1f9155a94fb96158383 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 1 Apr 2016 00:02:47 -0400 Subject: [PATCH] Add FastUtil to Bukkit @@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/pom.xml b/pom.xml -index 229fe559..412a6901 100644 +index a613cf963..f8f12595b 100644 --- a/pom.xml +++ b/pom.xml -@@ -44,6 +44,12 @@ +@@ -50,6 +50,12 @@ diff --git a/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch index ca9ad16c7f..6a841d0dd0 100644 --- a/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From bb0950fa863a7f52e3217d936719224d650e224f Mon Sep 17 00:00:00 2001 +From dd5c7d73e74b48760f58cee1810cb23f3c9a4352 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index 412a6901..041ae474 100644 +index f8f12595b..84ba2076f 100644 --- a/pom.xml +++ b/pom.xml -@@ -110,6 +110,17 @@ +@@ -116,6 +116,17 @@ 1.3 test @@ -29,7 +29,7 @@ index 412a6901..041ae474 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 00000000..9ff99e3b +index 000000000..9ff99e3b3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +1,40 @@ @@ -75,7 +75,7 @@ index 00000000..9ff99e3b +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 00000000..f60f0100 +index 000000000..f60f01005 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java @@ -0,0 +1,39 @@ @@ -120,7 +120,7 @@ index 00000000..f60f0100 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 00000000..140cf0ad +index 000000000..140cf0ad3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +1,44 @@ @@ -170,7 +170,7 @@ index 00000000..140cf0ad +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 00000000..6941d9fb +index 000000000..6941d9fbf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +1,32 @@ @@ -208,7 +208,7 @@ index 00000000..6941d9fb +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 00000000..1473ff8c +index 000000000..1473ff8cd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +1,63 @@ @@ -277,7 +277,7 @@ index 00000000..1473ff8c +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 00000000..62acbf82 +index 000000000..62acbf821 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +1,33 @@ @@ -315,7 +315,7 @@ index 00000000..62acbf82 + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index 3b2c99ea..b45b6c1c 100644 +index 3b2c99ea7..b45b6c1c3 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java @@ -4,9 +4,81 @@ import org.bukkit.event.Event; @@ -401,7 +401,7 @@ index 3b2c99ea..b45b6c1c 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index bf972302..77207f14 100644 +index bf9723029..77207f147 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -290,20 +290,7 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch index c0a5e90915..a0e856f7db 100644 --- a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 9ac71cdcf1de81731a46bd1f0aabac54498a6a06 Mon Sep 17 00:00:00 2001 +From d735b2fd3473458c15a83c4cf0635cd19957b476 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 041ae474..3e2c1cd5 100644 +index 84ba2076f..3ebc62871 100644 --- a/pom.xml +++ b/pom.xml -@@ -97,6 +97,14 @@ +@@ -103,6 +103,14 @@ compile @@ -33,7 +33,7 @@ index 041ae474..3e2c1cd5 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index 55debf5d..8d2999ac 100644 +index 55debf5d5..8d2999ace 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -157,6 +157,12 @@ public interface Plugin extends TabExecutor { diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 772c566d1d..927403b9fa 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From ef90bb4bf2978d2ccbf689adb67234a1c9637197 Mon Sep 17 00:00:00 2001 +From 51116ba061eb9636505373682ff631bd10ac7c58 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index b8c0d03fc3..87202a520f 100644 +index a985cf0c7b..0305674eb0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ @@ -45,7 +45,7 @@ index b8c0d03fc3..87202a520f 100644 ${project.version} compile -@@ -96,34 +95,22 @@ +@@ -102,34 +101,22 @@ @@ -91,7 +91,7 @@ index b8c0d03fc3..87202a520f 100644 -@@ -133,11 +120,13 @@ +@@ -139,11 +126,13 @@ maven-jar-plugin 2.4 @@ -106,7 +106,7 @@ index b8c0d03fc3..87202a520f 100644 ${maven.build.timestamp} Bukkit ${api.version} -@@ -177,20 +166,23 @@ +@@ -183,20 +172,23 @@ shade @@ -138,7 +138,7 @@ index b8c0d03fc3..87202a520f 100644 org.bukkit.craftbukkit org.bukkit.craftbukkit.v${minecraft_version} -@@ -216,10 +208,6 @@ +@@ -222,10 +214,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.8.0 diff --git a/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch index fe54ddfa8b..88e75a25a1 100644 --- a/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch @@ -1,11 +1,11 @@ -From 432999c0958b9942cde0ae4b0c5c89a2b7e0640a Mon Sep 17 00:00:00 2001 +From f156aa78cff3ffb08f6f18e039295fc4bb88b64e 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/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 7ef67350a..9dc2d8be2 100644 +index 7ef67350a5..9dc2d8be27 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -163,6 +163,12 @@ public class EntityPig extends EntityAnimal { @@ -22,7 +22,7 @@ index 7ef67350a..9dc2d8be2 100644 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index f8e05b75d..213d0b18c 100644 +index f8e05b75de..213d0b18c9 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -606,6 +606,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -39,10 +39,10 @@ index f8e05b75d..213d0b18c 100644 entitywitch.prepare(this.world.getDamageScaler(new BlockPosition(entitywitch)), (GroupDataEntity) null, (NBTTagCompound) null); entitywitch.setNoAI(this.isNoAI()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7fe10fbe7..4097168a2 100644 +index b1df5985ef..ad83c69d76 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -870,6 +870,14 @@ public class CraftEventFactory { +@@ -875,6 +875,14 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch index eb6f088a71..c283c21db1 100644 --- a/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 9b665d86432862f20fd8925e96574778337696fd Mon Sep 17 00:00:00 2001 +From 0f02d1e6cca532db18c2748b4eb53cccbb554a9f 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/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 808d1a120..3030dd9c3 100644 +index 808d1a120a..3030dd9c31 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -185,7 +185,7 @@ public class EntityExperienceOrb extends Entity { @@ -18,10 +18,10 @@ index 808d1a120..3030dd9c3 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b8bf1fbef..717cd0f42 100644 +index ad83c69d76..cf215205be 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -51,6 +51,7 @@ import org.bukkit.entity.Player; +@@ -52,6 +52,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.entity.ThrownExpBottle; import org.bukkit.entity.ThrownPotion; @@ -29,7 +29,7 @@ index b8bf1fbef..717cd0f42 100644 import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.Event.Result; -@@ -833,6 +834,17 @@ public class CraftEventFactory { +@@ -838,6 +839,17 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch index dd1686535e..40f74c4fdc 100644 --- a/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 03fec54dc977d5a0cb70e31330a235e119d12796 Mon Sep 17 00:00:00 2001 +From 35850901291462e598576298d4b4912569c0ffd3 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -87,10 +87,10 @@ index 751ea456b9..bab5b89fe9 100644 if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.getBlockPosition()).getBlock() == Blocks.NETHER_PORTAL) { this.e(movingobjectposition.getBlockPosition()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b386395560..866dee45b0 100644 +index cf215205be..fb0fe35000 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -974,6 +974,16 @@ public class CraftEventFactory { +@@ -979,6 +979,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } diff --git a/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 098b17bd29..dc8faaae7a 100644 --- a/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 2aca511c4110fde82bf8492a8ae4d9f82cd78c58 Mon Sep 17 00:00:00 2001 +From 46e0d985edf2b7562b12d4419d5315fd658e25ea Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -8,7 +8,7 @@ Adds lots of information about why this orb exists. Replaces isFromBottle() with logic that persists entity reloads too. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index dbf1089ba..66643be2b 100644 +index dbf1089bac..66643be2bf 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -450,13 +450,13 @@ public class Block implements IMaterial { @@ -28,7 +28,7 @@ index dbf1089ba..66643be2b 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index b3fbc8249..79d8be8d4 100644 +index b3fbc8249e..79d8be8d46 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo @@ -41,7 +41,7 @@ index b3fbc8249..79d8be8d4 100644 } diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 3030dd9c3..404a222b4 100644 +index 3030dd9c31..404a222b45 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity { @@ -120,7 +120,7 @@ index 3030dd9c3..404a222b4 100644 public void d(EntityHuman entityhuman) { diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 23f7d36b5..e1c685eed 100644 +index 23f7d36b55..e1c685eede 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity { @@ -133,7 +133,7 @@ index 23f7d36b5..e1c685eed 100644 // CraftBukkit end if (itemstack1.getItem().a(TagsItem.FISHES)) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f58ebe3c2..f2e38b9f3 100644 +index f58ebe3c23..f2e38b9f35 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity { @@ -147,7 +147,7 @@ index f58ebe3c2..f2e38b9f3 100644 this.expToDrop = 0; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java -index a5e1939e0..e73dba09a 100644 +index a5e1939e05..e73dba09a6 100644 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java @@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile { @@ -160,7 +160,7 @@ index a5e1939e0..e73dba09a 100644 this.die(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index ebe397b15..78acac4ca 100644 +index ebe397b15a..78acac4ca7 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -412,7 +412,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -173,7 +173,7 @@ index ebe397b15..78acac4ca 100644 if (this.tradingPlayer instanceof EntityPlayer) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java -index bf061cf06..55f978768 100644 +index bf061cf064..55f9787680 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal { @@ -186,10 +186,10 @@ index bf061cf06..55f978768 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index a165378ac..50a1239c2 100644 +index 0baf0100c9..6ae6afa339 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java -@@ -399,7 +399,7 @@ public class PlayerInteractManager { +@@ -391,7 +391,7 @@ public class PlayerInteractManager { // CraftBukkit start - Drop event experience if (flag && event != null) { @@ -199,7 +199,7 @@ index a165378ac..50a1239c2 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java -index 5ac554d65..d70c4dda5 100644 +index 5ac554d65e..d70c4dda5a 100644 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java @@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent; @@ -221,7 +221,7 @@ index 5ac554d65..d70c4dda5 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0f3bf13ef..36d27c2a3 100644 +index 0f3bf13efe..36d27c2a3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1354,7 +1354,7 @@ public class CraftWorld implements World { @@ -234,7 +234,7 @@ index 0f3bf13ef..36d27c2a3 100644 // not sure what this can do if (LightningStrike.class.isAssignableFrom(clazz)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java -index 3a09cab3d..3302af0e4 100644 +index 3a09cab3d4..3302af0e45 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java @@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { diff --git a/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch index 9861e615c5..b4757e36c8 100644 --- a/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 24bc29559bef951a0595aa26db08a6c62130ed0d Mon Sep 17 00:00:00 2001 +From 15e28d72f3c046e9bc532e048218675fac9c18f8 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index d1913a434..1512ff969 100644 +index 0305674eb0..bf1c2ab823 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,27 @@ @@ -54,7 +54,7 @@ index d1913a434..1512ff969 100644 org.ow2.asm -@@ -199,10 +216,18 @@ +@@ -205,10 +222,18 @@ META-INF/services/java.sql.Driver @@ -75,7 +75,7 @@ index d1913a434..1512ff969 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java new file mode 100644 -index 000000000..688b4715e +index 0000000000..688b4715eb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -0,0 +1,40 @@ @@ -121,7 +121,7 @@ index 000000000..688b4715e +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 000000000..685deaa0e +index 0000000000..685deaa0e5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -143,7 +143,7 @@ index 000000000..685deaa0e + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 4e9ef43b4..5bb1ea880 100644 +index 4e9ef43b45..5bb1ea880a 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -185,7 +185,7 @@ index 4e9ef43b4..5bb1ea880 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index dd910b16d..e046c2e33 100644 +index dd910b16d0..e046c2e334 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -56,7 +56,6 @@ import org.apache.commons.lang3.Validate; @@ -243,7 +243,7 @@ index dd910b16d..e046c2e33 100644 public KeyPair E() { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9d44dcb3b..8bb3fef21 100644 +index 9d44dcb3b2..8bb3fef21e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -77,8 +77,7 @@ public abstract class PlayerList { @@ -257,7 +257,7 @@ index 9d44dcb3b..8bb3fef21 100644 this.k = new GameProfileBanList(PlayerList.a); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 471da648f..7430c27bc 100644 +index 471da648f9..7430c27bcc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -144,8 +144,8 @@ import java.nio.ByteBuffer; @@ -285,7 +285,7 @@ index 471da648f..7430c27bc 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 5c62e990a..b174a4efa 100644 +index 5c62e990ab..b174a4efae 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -14,7 +14,7 @@ import java.util.logging.Logger; @@ -327,7 +327,7 @@ index 5c62e990a..b174a4efa 100644 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 -index 26a2fb894..000000000 +index 26a2fb8942..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -1,74 +0,0 @@ @@ -406,7 +406,7 @@ index 26a2fb894..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 33e8ea02c..1e3aae3b8 100644 +index 33e8ea02c4..1e3aae3b8f 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -8,17 +8,27 @@ import java.util.logging.Level; @@ -485,7 +485,7 @@ index 33e8ea02c..1e3aae3b8 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 984df4083..bbb5a84f3 100644 +index 984df4083d..bbb5a84f36 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread { @@ -499,7 +499,7 @@ index 984df4083..bbb5a84f3 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java deleted file mode 100644 -index b64097113..000000000 +index b640971130..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -1,54 +0,0 @@ @@ -558,7 +558,7 @@ index b64097113..000000000 - } -} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 5cee8f00e..08b6bb7f9 100644 +index 5cee8f00ef..08b6bb7f97 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,12 +1,11 @@ diff --git a/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch index b9879e3a23..52fc9152af 100644 --- a/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,11 +1,11 @@ -From 47927bae1594244801c9463f4be46f1fbe21814a Mon Sep 17 00:00:00 2001 +From 3432691ec7a7e0cc2fca8f8b6c392ef2d27218a7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index af31030dc..b6764c7ec 100644 +index af31030dc7..b6764c7ec1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -378,4 +378,10 @@ public class PaperWorldConfig { @@ -20,10 +20,10 @@ index af31030dc..b6764c7ec 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 943963047..ea4262154 100644 +index fb0fe35000..228f4b28eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -389,16 +389,32 @@ public class CraftEventFactory { +@@ -394,16 +394,32 @@ public class CraftEventFactory { EntityExperienceOrb xp = (EntityExperienceOrb) entity; double radius = world.spigotConfig.expMerge; if (radius > 0) { diff --git a/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch index f2f38128a9..442f321825 100644 --- a/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From faebfc4f844215b7c279659f879bbbd2b1023e2e Mon Sep 17 00:00:00 2001 +From 273a0c3b097f14c48a6074d6cbe1a1ab445a9936 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ea4262154..a7c0f8dd8 100644 +index 228f4b28eb..0c57b36c8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -399,7 +399,7 @@ public class CraftEventFactory { +@@ -404,7 +404,7 @@ public class CraftEventFactory { if (e instanceof EntityExperienceOrb) { EntityExperienceOrb loopItem = (EntityExperienceOrb) e; // Paper start diff --git a/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch index bc30872dbe..4a9868d63d 100644 --- a/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From 0ef21ee5503aff8e8f71127f438bf2d91b10e662 Mon Sep 17 00:00:00 2001 +From c9d537eabbe80fd57f2fef3120457965351fa96a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Feb 2018 10:43:46 +0000 Subject: [PATCH] Extend Player Interact cancellation @@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds when cancelling interaction. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 50a1239c2..ef0b03795 100644 +index 6ae6afa339..07f9b8d2f7 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -111,6 +111,11 @@ public class PlayerInteractManager { @@ -28,7 +28,7 @@ index 50a1239c2..ef0b03795 100644 // Update any tile entity data for this block TileEntity tileentity = this.world.getTileEntity(blockposition); if (tileentity != null) { -@@ -474,7 +479,25 @@ public class PlayerInteractManager { +@@ -466,7 +471,25 @@ public class PlayerInteractManager { ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down())); } else if (iblockdata.getBlock() instanceof BlockCake) { ((EntityPlayer) entityhuman).getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake diff --git a/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 00f62e1982..e9b1cfd14b 100644 --- a/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 3be76f44a3248e38ff54a3107a9914c9efd41240 Mon Sep 17 00:00:00 2001 +From 4cecc779c616eee62691db263753aef45e345bfc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:51:17 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -59,10 +59,10 @@ index 6934114005..52bc68e6a6 100644 if (itemstack1.isEmpty()) { entityhuman.inventory.f(itemstack1); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e240c50bc3..edafaf0de7 100644 +index 0c57b36c8e..e75c188b5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -327,7 +327,7 @@ public class CraftEventFactory { +@@ -332,7 +332,7 @@ public class CraftEventFactory { /** * EntityShootBowEvent */ @@ -71,7 +71,7 @@ index e240c50bc3..edafaf0de7 100644 LivingEntity shooter = (LivingEntity) who.getBukkitEntity(); CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack); Arrow arrow = (Arrow) entityArrow.getBukkitEntity(); -@@ -336,7 +336,7 @@ public class CraftEventFactory { +@@ -341,7 +341,7 @@ public class CraftEventFactory { itemInHand = null; } diff --git a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch index 1ebb4680e9..595dd3cc6e 100644 --- a/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 72f1734c2d51d09eeeb0a04097edf686ff09bec9 Mon Sep 17 00:00:00 2001 +From fa0a3dad58143b0bd96b5d8c6ed81f94c42b02b6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -168,10 +168,10 @@ index 0753a0f266..ce58cfc11e 100644 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index edafaf0de7..d8f2e0c1b6 100644 +index e75c188b5e..167a3baec7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1105,8 +1105,19 @@ public class CraftEventFactory { +@@ -1110,8 +1110,19 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch index 89bdffc5e9..c5b5ed5562 100644 --- a/Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 7873505a5f5f1bc68192662b9fda9c559e5e6ac0 Mon Sep 17 00:00:00 2001 +From 92348c1acf40bee68a6ffb3b1d0e0d12e39a4597 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 14:22:26 +0200 Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1b5663e52..682ab80d9 100644 +index e16fd4e5e9..61a547a40d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 1b5663e52..682ab80d9 100644 protected int k; private Entity vehicle; diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index 85d364b8f..ff6c8e2b5 100644 +index 85d364b8f4..ff6c8e2b55 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -70,7 +70,8 @@ public class ItemBlock extends Item { @@ -32,7 +32,7 @@ index 85d364b8f..ff6c8e2b5 100644 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 074d14b19..93b0544e0 100644 +index 074d14b196..93b0544e0f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1524,6 +1524,37 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -74,10 +74,10 @@ index 074d14b19..93b0544e0 100644 if (voxelshape.isEmpty()) { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d8f2e0c1b..fa11f966b 100644 +index 167a3baec7..1b13fa6186 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -995,6 +995,14 @@ public class CraftEventFactory { +@@ -1000,6 +1000,14 @@ 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); diff --git a/Spigot-Server-Patches/0318-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0318-Add-hand-to-bucket-events.patch index d1d8dd7907..8979d9cc36 100644 --- a/Spigot-Server-Patches/0318-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0318-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From f9d0f4a174d7953eab8c74a20b20747ee80d25a0 Mon Sep 17 00:00:00 2001 +From 6f5ab26fd61ec2013afce229efda24dbe932ebc6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:35 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 5ac88166f..5874d2993 100644 +index 5ac88166fd..5874d2993c 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -65,7 +65,7 @@ public class EntityCow extends EntityAnimal { @@ -18,7 +18,7 @@ index 5ac88166f..5874d2993 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index 6f5dda880..a064897fc 100644 +index 6f5dda880b..a064897fc4 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -35,7 +35,7 @@ public class ItemBucket extends Item { @@ -67,10 +67,10 @@ index 6f5dda880..a064897fc 100644 ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index fa3bb1047..a2841ee53 100644 +index 1b13fa6186..93da4c7267 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -229,6 +229,20 @@ public class CraftEventFactory { +@@ -234,6 +234,20 @@ public class CraftEventFactory { } private static PlayerEvent getPlayerBucketEvent(boolean isFilling, EntityHuman who, int clickedX, int clickedY, int clickedZ, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) { @@ -91,7 +91,7 @@ index fa3bb1047..a2841ee53 100644 Player player = (who == null) ? null : (Player) who.getBukkitEntity(); CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item); Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem()); -@@ -241,10 +255,10 @@ public class CraftEventFactory { +@@ -246,10 +260,10 @@ public class CraftEventFactory { PlayerEvent event = null; if (isFilling) { diff --git a/Spigot-Server-Patches/0350-Improve-death-events.patch b/Spigot-Server-Patches/0350-Improve-death-events.patch index b2202f18c3..b1fb770f55 100644 --- a/Spigot-Server-Patches/0350-Improve-death-events.patch +++ b/Spigot-Server-Patches/0350-Improve-death-events.patch @@ -1,4 +1,4 @@ -From b3f8e2954c26b3ea5e5518131483169b70b7e225 Mon Sep 17 00:00:00 2001 +From e6029510bcd0fbcc270a9c694c71894a6bfaaaa0 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -305,10 +305,10 @@ index 07b9545e76..a2eae5d10c 100644 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index da1fc58930..58ebecefe0 100644 +index 93da4c7267..054ebc82bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -595,9 +595,16 @@ public class CraftEventFactory { +@@ -600,9 +600,16 @@ public class CraftEventFactory { public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List drops) { CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward()); @@ -325,7 +325,7 @@ index da1fc58930..58ebecefe0 100644 victim.expToDrop = event.getDroppedExp(); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { -@@ -613,8 +620,15 @@ public class CraftEventFactory { +@@ -618,8 +625,15 @@ public class CraftEventFactory { CraftPlayer entity = victim.getBukkitEntity(); PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage); event.setKeepInventory(keepInventory); @@ -341,7 +341,7 @@ index da1fc58930..58ebecefe0 100644 victim.keepLevel = event.getKeepLevel(); victim.newLevel = event.getNewLevel(); -@@ -635,6 +649,31 @@ public class CraftEventFactory { +@@ -640,6 +654,31 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch index 2d8b7c5030..1373b1fe79 100644 --- a/Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch +++ b/Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch @@ -1,4 +1,4 @@ -From 31e7140454df9477e1b83041498f33dde76e2650 Mon Sep 17 00:00:00 2001 +From 17e3cdb6f3d0d395f60b6c8fa92dab6a703f1b36 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 16:55:04 -0400 Subject: [PATCH] Async Chunk Loading and Generation @@ -2381,10 +2381,10 @@ index 95fe3a91bf..b5a87cfaf6 100644 if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) { unloadChunk(chunkCoordX + x, chunkCoordZ + z); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 58ebecefe0..282b4e6c38 100644 +index 054ebc82bd..2e0b4de83b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -81,6 +81,7 @@ public class CraftEventFactory { +@@ -82,6 +82,7 @@ public class CraftEventFactory { public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC); public static org.bukkit.block.Block blockDamage; // For use in EntityDamageByBlockEvent public static Entity entityDamage; // For use in EntityDamageByEntityEvent @@ -2392,7 +2392,7 @@ index 58ebecefe0..282b4e6c38 100644 // helper methods private static boolean canBuild(CraftWorld world, Player player, int x, int z) { -@@ -469,6 +470,7 @@ public class CraftEventFactory { +@@ -474,6 +475,7 @@ public class CraftEventFactory { CraftServer craftServer = (CraftServer) entity.getServer(); CreatureSpawnEvent event = new CreatureSpawnEvent(entity, spawnReason); @@ -2400,7 +2400,7 @@ index 58ebecefe0..282b4e6c38 100644 craftServer.getPluginManager().callEvent(event); return event; } -@@ -1123,6 +1125,7 @@ public class CraftEventFactory { +@@ -1128,6 +1130,7 @@ public class CraftEventFactory { } BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(block.getX(), block.getY(), block.getZ()), cause, igniter); @@ -2408,7 +2408,7 @@ index 58ebecefe0..282b4e6c38 100644 world.getServer().getPluginManager().callEvent(event); return event; } -@@ -1147,6 +1150,7 @@ public class CraftEventFactory { +@@ -1152,6 +1155,7 @@ public class CraftEventFactory { } BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), cause, bukkitIgniter); @@ -2416,7 +2416,7 @@ index 58ebecefe0..282b4e6c38 100644 world.getServer().getPluginManager().callEvent(event); return event; } -@@ -1354,7 +1358,8 @@ public class CraftEventFactory { +@@ -1359,7 +1363,8 @@ public class CraftEventFactory { public static BlockPhysicsEvent callBlockPhysicsEvent(GeneratorAccess world, BlockPosition blockposition) { org.bukkit.block.Block block = CraftBlock.at(world, blockposition); BlockPhysicsEvent event = new BlockPhysicsEvent(block, block.getBlockData()); @@ -2426,7 +2426,7 @@ index 58ebecefe0..282b4e6c38 100644 return event; } -@@ -1390,6 +1395,7 @@ public class CraftEventFactory { +@@ -1395,6 +1400,7 @@ public class CraftEventFactory { } EntityPotionEffectEvent event = new EntityPotionEffectEvent((LivingEntity) entity.getBukkitEntity(), bukkitOldEffect, bukkitNewEffect, cause, action, willOverride); @@ -2434,7 +2434,7 @@ index 58ebecefe0..282b4e6c38 100644 Bukkit.getPluginManager().callEvent(event); return event; -@@ -1408,6 +1414,7 @@ public class CraftEventFactory { +@@ -1413,6 +1419,7 @@ public class CraftEventFactory { blockState.setData(block); BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(entity.getBukkitEntity(), blockState.getBlock(), blockState); diff --git a/Spigot-Server-Patches/0395-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0395-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch index 42032fab71..a83a1b17fb 100644 --- a/Spigot-Server-Patches/0395-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch +++ b/Spigot-Server-Patches/0395-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch @@ -1,4 +1,4 @@ -From 17f7952a20a3acc5a90ae35e6d65abe9fe8e992c Mon Sep 17 00:00:00 2001 +From f8492ff97954e2f4b15a9c3df7658245044f1ede Mon Sep 17 00:00:00 2001 From: MisterVector Date: Thu, 1 Nov 2018 14:50:05 -0700 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block @@ -13,10 +13,10 @@ keep the clone of the item used to a non empty value so it represents the item used. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 22574a184f..74dcbc74ff 100644 +index 22378b6bc8..5e595b62e5 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java -@@ -384,10 +384,11 @@ public class PlayerInteractManager { +@@ -380,10 +380,11 @@ public class PlayerInteractManager { ItemStack itemstack1 = this.player.getItemInMainHand(); boolean flag1 = this.player.hasBlock(iblockdata); diff --git a/work/Bukkit b/work/Bukkit index 60268ac8be..d58803c2b6 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 60268ac8be079ac815ee0d63ed1c1c4935258e44 +Subproject commit d58803c2b640ab583f259a5c6a8b5d1919634ae3 diff --git a/work/CraftBukkit b/work/CraftBukkit index 2aba349f1a..ed274c517f 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 2aba349f1a39a804826584ef9abbd9f5bae565ea +Subproject commit ed274c517f57b2fa0d181d3c32c5b3544d67689d