From 1912d066134201acf0b6884d8bfbb6c83146a14e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 24 Nov 2017 07:14:38 +0000 Subject: [PATCH] Update B/CB --- .../0162-Add-EntityZapEvent.patch | 8 ++++---- ...0171-Add-source-to-PlayerExpChangeEvent.patch | 16 ++++++++-------- .../0175-Add-ProjectileCollideEvent.patch | 8 ++++---- ...0176-Vanished-players-don-t-have-rights.patch | 10 +++++----- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch index 228a7c4ed8..08551926db 100644 --- a/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 7337dbfb6832634fa92cdc007e2334018be708e0 Mon Sep 17 00:00:00 2001 +From da1a1de8534fd41d16d2d51c03249b6c306f3ca4 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent @@ -48,10 +48,10 @@ index 70b12c5cd..ae68f07ab 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4385cd969..bdeeac36f 100644 +index bc84dd30f..ba7e5d181 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -675,6 +675,14 @@ public class CraftEventFactory { +@@ -684,6 +684,14 @@ public class CraftEventFactory { return event; } @@ -67,5 +67,5 @@ index 4385cd969..bdeeac36f 100644 HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.13.2 +2.15.0 diff --git a/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch index a7ddca6077..76b4162c7a 100644 --- a/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch @@ -1,15 +1,15 @@ -From b9cf0c402f2c29fa10934108747fc075759462eb Mon Sep 17 00:00:00 2001 +From 1a2f8fc03d482c57b6a4d9ca1c83de647a15d472 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 b200bbf64..ec23eb98c 100644 +index eae706368..bf5f1f0e8 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -@@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity { - } +@@ -178,7 +178,7 @@ public class EntityExperienceOrb extends Entity { + } if (this.value > 0) { - entityhuman.giveExp(CraftEventFactory.callPlayerExpChangeEvent(entityhuman, this.value).getAmount()); // CraftBukkit - this.value -> event.getAmount() @@ -18,10 +18,10 @@ index b200bbf64..ec23eb98c 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 bdeeac36f..7422a91f0 100644 +index ba7e5d181..87b4e9189 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -45,6 +45,7 @@ import org.bukkit.entity.Player; +@@ -46,6 +46,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 bdeeac36f..7422a91f0 100644 import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.block.*; -@@ -647,6 +648,17 @@ public class CraftEventFactory { +@@ -656,6 +657,17 @@ public class CraftEventFactory { return event; } @@ -48,5 +48,5 @@ index bdeeac36f..7422a91f0 100644 Block block = world.getWorld().getBlockAt(x, y, z); CraftBlockState state = (CraftBlockState) block.getState(); -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch index 0798dcdd21..79bd038df6 100644 --- a/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 7c179086ea4e84afc3bcfb4f28513a0ce33bba44 Mon Sep 17 00:00:00 2001 +From 39c3eb108b425ab36b87bf4102bc8c5836913003 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -86,10 +86,10 @@ index cfcaf3832..01c7fcc8b 100644 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 7422a91f0..16f6410b2 100644 +index 87b4e9189..06a277b3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -796,6 +796,16 @@ public class CraftEventFactory { +@@ -805,6 +805,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } @@ -107,5 +107,5 @@ index 7422a91f0..16f6410b2 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.14.2 +2.15.0 diff --git a/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch index e70ba0a71b..caca1d980d 100644 --- a/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 1cc4d5c4bd56750665addda72b522ae03480e5db Mon Sep 17 00:00:00 2001 +From 8637b48ac66365659560c2b876b8e2b6da7ce3fe 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/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a042c37c7..e0ae1f7dd 100644 +index 42da707ae..9080006e5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener { @@ -78,10 +78,10 @@ index 445936c7b..843c944ab 100644 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 16f6410b2..883ef489f 100644 +index 06a277b3b..5f816e44f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -801,6 +801,13 @@ public class CraftEventFactory { +@@ -810,6 +810,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); @@ -96,5 +96,5 @@ index 16f6410b2..883ef489f 100644 return event; } -- -2.14.2 +2.15.0 diff --git a/work/Bukkit b/work/Bukkit index ee68fbfb8e..78ce389df2 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit ee68fbfb8eff0160810be0f1c1df534258e470f5 +Subproject commit 78ce389df2c5e37b943a112949a7af604eb5f38f diff --git a/work/CraftBukkit b/work/CraftBukkit index 19ed80cef7..f46ccd7637 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 19ed80cef7d8ff85a368bd8459c1d91ef0149f61 +Subproject commit f46ccd7637430f00b4fa7c742a859e3d4b6a5f03