diff --git a/Spigot-Server-Patches/0142-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0142-Add-EntityZapEvent.patch index 8c51f1916d..284c0d59b6 100644 --- a/Spigot-Server-Patches/0142-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0142-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 9e4cd9c04aa30130fee5dc678fc2f9812e24ccf4 Mon Sep 17 00:00:00 2001 +From ca8434b485225bfe2ef0d35428cfe473fe1dc301 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent @@ -22,7 +22,7 @@ index fecc7e154d..b405e63e81 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 74a9fa9434..10921c1cbc 100644 +index 32e327e42c..5aebdba56c 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -610,6 +610,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -48,10 +48,10 @@ index 74a9fa9434..10921c1cbc 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e39352c221..4c98c7b337 100644 +index 5c5d85fabc..d427cbf88d 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -695,6 +695,14 @@ public class CraftEventFactory { +@@ -697,6 +697,14 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0150-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0150-Add-source-to-PlayerExpChangeEvent.patch index a8b7c2c65e..d19e6406d1 100644 --- a/Spigot-Server-Patches/0150-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0150-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From 75d4ed8c2d6ddcca383a8e9e57733bbbca66ca1b Mon Sep 17 00:00:00 2001 +From a39cfd645969493bcdc977e0a75c25ce62f1e57c Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent @@ -18,7 +18,7 @@ index 33b24c833b..880f496526 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 4c98c7b337..488d0221c2 100644 +index d427cbf88d..2bf5cad1e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -48,6 +48,7 @@ import org.bukkit.entity.Player; @@ -29,7 +29,7 @@ index 4c98c7b337..488d0221c2 100644 import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.block.*; -@@ -664,6 +665,17 @@ public class CraftEventFactory { +@@ -666,6 +667,17 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0153-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0153-Add-ProjectileCollideEvent.patch index c10949d8bf..1c825d9abb 100644 --- a/Spigot-Server-Patches/0153-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0153-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 35af608bf342b067ec974d7a2bd5fea0b8241388 Mon Sep 17 00:00:00 2001 +From 095f0dae4bedb5da2d31e79ce2021203c3f303ba 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 ee402d4140..fc8c0cab55 100644 if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.NETHER_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 488d0221c2..89e765e803 100644 +index 2bf5cad1e9..dbb714ecdd 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -799,6 +799,16 @@ public class CraftEventFactory { +@@ -801,6 +801,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } diff --git a/Spigot-Server-Patches/0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch index 9bacae24bf..d79c72f31f 100644 --- a/Spigot-Server-Patches/0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch +++ b/Spigot-Server-Patches/0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch @@ -1,4 +1,4 @@ -From db8ced733dd05196185e76f26de8d91e30c66216 Mon Sep 17 00:00:00 2001 +From ab55001552db9cf02bba4601b28078c67cec02b5 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 30 Jun 2018 05:45:39 +0200 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the @@ -6,10 +6,10 @@ Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 92960eb735..ea2faf9539 100644 +index 74b53275bf..d6ff3f3303 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -823,7 +823,7 @@ public class CraftEventFactory { +@@ -825,7 +825,7 @@ public class CraftEventFactory { hitBlock = entity.getBukkitEntity().getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); } diff --git a/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch index e56f1b785a..537e6d0770 100644 --- a/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 90654cfcc3c8c6b4d80c09dac65e13f583b50e63 Mon Sep 17 00:00:00 2001 +From a57e837ad133424234ad4280450505f09098514c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 6bbb737df..614fce444 100644 +index 6bbb737df7..614fce4447 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -900,7 +900,7 @@ public class Chunk implements IChunkAccess { @@ -29,7 +29,7 @@ index 6bbb737df..614fce444 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 6ae76477c..f2bce333d 100644 +index 6ae76477c0..f2bce333d9 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -153,7 +153,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -56,7 +56,7 @@ index 6ae76477c..f2bce333d 100644 this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 49470bf5f..781c8abc3 100644 +index 49470bf5f0..781c8abc39 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -355,7 +355,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -110,7 +110,7 @@ index 49470bf5f..781c8abc3 100644 this.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a7bdb9737..4fc5e4b7b 100644 +index a7bdb9737b..4fc5e4b7b3 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2051,7 +2051,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -123,7 +123,7 @@ index a7bdb9737..4fc5e4b7b 100644 this.player.m(); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 304cae655..6d511b623 100644 +index 304cae655d..6d511b6230 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -422,7 +422,7 @@ public abstract class PlayerList { @@ -136,7 +136,7 @@ index 304cae655..6d511b623 100644 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game"); cserver.getPluginManager().callEvent(playerQuitEvent); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 92fe80316..70a4dbe26 100644 +index 92fe80316f..70a4dbe26b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -412,8 +412,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -155,7 +155,7 @@ index 92fe80316..70a4dbe26 100644 public boolean isBlocking() { return getHandle().isBlocking(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 88caea739..b7144c5d2 100644 +index 88caea739c..b7144c5d2f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -727,7 +727,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -168,10 +168,10 @@ index 88caea739..b7144c5d2 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 ea2faf953..9fb1b7541 100644 +index d6ff3f3303..1cc17c29c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -913,8 +913,19 @@ public class CraftEventFactory { +@@ -915,8 +915,19 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0305-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0305-Vanished-players-don-t-have-rights.patch index c8db38503a..4ee1f5acb3 100644 --- a/Spigot-Server-Patches/0305-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0305-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 171d1bef3552c5868aa5af2566a0ac7d87e2b675 Mon Sep 17 00:00:00 2001 +From ed0e15209a73c658ffe750456744084ff00ee55a 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 d86a23d71d..4a2faa314e 100644 +index 89a83548b8..9339b3255d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -94,7 +94,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -64,7 +64,7 @@ index 700900256b..b7d2fa2f0e 100644 return this.a.a(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 73cd2d015b..3ea26d5ad8 100644 +index caec2807a6..e7576c5c6a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1581,6 +1581,37 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -106,10 +106,10 @@ index 73cd2d015b..3ea26d5ad8 100644 if (voxelshape.b()) { 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 9fb1b75413..1f3774c249 100644 +index 1cc17c29c9..a61c32a2f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -804,6 +804,14 @@ public class CraftEventFactory { +@@ -806,6 +806,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/work/CraftBukkit b/work/CraftBukkit index 4228a56c0d..9636bb8d77 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 4228a56c0dcb17c9c1333619d2faa21f6c02bfc1 +Subproject commit 9636bb8d77ea0463b9fa9c9e08787b6ee843eb1c