Skip to content

Commit 26dfbc8

Browse files
electronicboyelectronicboy
committed
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 3aa8286 SPIGOT-794: Add boats to EntityPlaceEvent c36d90a SPIGOT-5464: Add BEEHIVE SpawnReason for when a bee leaves a beehive CraftBukkit Changes: 90ef74e SPIGOT-794: Add boats to EntityPlaceEvent fb7abcb SPIGOT-5466: Bees still get angry even if damage event cancelled 4499fec SPIGOT-5464: Add BEEHIVE SpawnReason for when a bee leaves a beehive
1 parent 539543c commit 26dfbc8

12 files changed

+66
-66
lines changed

‎Spigot-Server-Patches/0120-Add-EntityZapEvent.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0a6ac5cc3a320acdc364fea28615f8565825bb37 Mon Sep 17 00:00:00 2001
1+
From 66d9b63f082a2229e6c51cc21cf50059758a0f7f Mon Sep 17 00:00:00 2001
22
From: AlphaBlend <whizkid3000@hotmail.com>
33
Date: Sun, 16 Oct 2016 23:19:30 -0700
44
Subject: [PATCH] Add EntityZapEvent
@@ -39,10 +39,10 @@ index 1eca7f354..8b85956e5 100644
3939
entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
4040
entitywitch.setNoAI(this.isNoAI());
4141
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
42-
index de26145ee..ba14f66f7 100644
42+
index e192f5f93..4b5d5e518 100644
4343
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
4444
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
45-
@@ -1040,6 +1040,14 @@ public class CraftEventFactory {
45+
@@ -1044,6 +1044,14 @@ public class CraftEventFactory {
4646
return event;
4747
}
4848

‎Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 777724ba4ea181c7f4d8297a1ce33d17a59c6d36 Mon Sep 17 00:00:00 2001
1+
From bd2d233c65f8d35946b2d592087eb0aaf0fc202b Mon Sep 17 00:00:00 2001
22
From: AlphaBlend <whizkid3000@hotmail.com>
33
Date: Thu, 8 Sep 2016 08:48:33 -0700
44
Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -18,7 +18,7 @@ index f72bb0c13..0447800d9 100644
1818

1919
this.die();
2020
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
21-
index ba14f66f7..3c52b40a3 100644
21+
index 4b5d5e518..e69d73c45 100644
2222
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2323
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2424
@@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index ba14f66f7..3c52b40a3 100644
2929
import org.bukkit.event.Cancellable;
3030
import org.bukkit.event.Event;
3131
import org.bukkit.event.Event.Result;
32-
@@ -999,6 +1000,17 @@ public class CraftEventFactory {
32+
@@ -1003,6 +1004,17 @@ public class CraftEventFactory {
3333
return event;
3434
}
3535

@@ -48,5 +48,5 @@ index ba14f66f7..3c52b40a3 100644
4848
return handleBlockGrowEvent(world, pos, block, 3);
4949
}
5050
--
51-
2.17.1
51+
2.24.1
5252

‎Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From ca1e8bd890fa9400cfd8e757611b8ae929ee7c4e Mon Sep 17 00:00:00 2001
1+
From 46b6f35ed25811c9b22312baad531d4df5ec30b6 Mon Sep 17 00:00:00 2001
22
From: Techcable <Techcable@outlook.com>
33
Date: Fri, 16 Dec 2016 21:25:39 -0600
44
Subject: [PATCH] Add ProjectileCollideEvent
55

66

77
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
8-
index fc70d50ac..0c3664758 100644
8+
index 2b14b2c3f..634e2bd30 100644
99
--- a/src/main/java/net/minecraft/server/EntityArrow.java
1010
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
1111
@@ -187,6 +187,17 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -93,10 +93,10 @@ index 2e4c9d426..724b78b5d 100644
9393
this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
9494
} else {
9595
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
96-
index 3c52b40a3..2bf53db88 100644
96+
index e69d73c45..c1eb5a05c 100644
9797
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
9898
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
99-
@@ -1144,6 +1144,16 @@ public class CraftEventFactory {
99+
@@ -1148,6 +1148,16 @@ public class CraftEventFactory {
100100
return CraftItemStack.asNMSCopy(bitem);
101101
}
102102

@@ -114,5 +114,5 @@ index 3c52b40a3..2bf53db88 100644
114114
Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
115115
ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
116116
--
117-
2.17.1
117+
2.24.1
118118

‎Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From efa15ce75601ea4142787336aa79021d9a66e302 Mon Sep 17 00:00:00 2001
1+
From 4c8d1dea432f2871c2337c2277c58b32437ece12 Mon Sep 17 00:00:00 2001
22
From: BillyGalbreath <Blake.Galbreath@GMail.com>
33
Date: Fri, 10 Nov 2017 23:03:12 -0500
44
Subject: [PATCH] Option for maximum exp value when merging orbs
55

66

77
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
8-
index c145e27ccb..671587631e 100644
8+
index c145e27cc..671587631 100644
99
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
1010
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
1111
@@ -338,4 +338,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index c145e27ccb..671587631e 100644
2020
+ }
2121
}
2222
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
23-
index 2bf53db885..e310f2afe1 100644
23+
index c1eb5a05c..b8e5c6322 100644
2424
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2525
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
26-
@@ -537,16 +537,32 @@ public class CraftEventFactory {
26+
@@ -541,16 +541,32 @@ public class CraftEventFactory {
2727
EntityExperienceOrb xp = (EntityExperienceOrb) entity;
2828
double radius = world.spigotConfig.expMerge;
2929
if (radius > 0) {

‎Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7a7a77f3a1ff391f37d670a7846a038d6fbf86a5 Mon Sep 17 00:00:00 2001
1+
From 0412767f0f442fe73bdd4047587935287d7e4775 Mon Sep 17 00:00:00 2001
22
From: Aikar <aikar@aikar.co>
33
Date: Tue, 19 Dec 2017 22:57:26 -0500
44
Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
88
metadata such as spawn reason, or conditionally move data from source to target.
99

1010
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
11-
index e310f2afe1..9b314eacc3 100644
11+
index b8e5c6322..060671a58 100644
1212
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
1313
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
14-
@@ -547,7 +547,7 @@ public class CraftEventFactory {
14+
@@ -551,7 +551,7 @@ public class CraftEventFactory {
1515
if (e instanceof EntityExperienceOrb) {
1616
EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
1717
// Paper start

‎Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
From ea676427ba9119a25f3d0cb7f5b20438058be63c Mon Sep 17 00:00:00 2001
1+
From 409cd7991a57a60511223af2b56ed401d82ecb61 Mon Sep 17 00:00:00 2001
22
From: Aikar <aikar@aikar.co>
33
Date: Sat, 15 Jun 2013 19:51:17 -0400
44
Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
55

66
Adds ability to get what arrow was shot, and control if it should be consumed.
77

88
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
9-
index d97558da3e..fdeb8980d9 100644
9+
index d97558da3..fdeb8980d 100644
1010
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
1111
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
1212
@@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index d97558da3e..fdeb8980d9 100644
1919
event.getProjectile().remove();
2020
return;
2121
diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
22-
index 4b07e18c7e..71800b34b4 100644
22+
index 4b07e18c7..71800b34b 100644
2323
--- a/src/main/java/net/minecraft/server/ItemBow.java
2424
+++ b/src/main/java/net/minecraft/server/ItemBow.java
2525
@@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon {
@@ -59,7 +59,7 @@ index 4b07e18c7e..71800b34b4 100644
5959
if (itemstack1.isEmpty()) {
6060
entityhuman.inventory.f(itemstack1);
6161
diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
62-
index 608be9e70a..011efc6f5b 100644
62+
index 608be9e70..011efc6f5 100644
6363
--- a/src/main/java/net/minecraft/server/ItemCrossbow.java
6464
+++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
6565
@@ -221,7 +221,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -72,7 +72,7 @@ index 608be9e70a..011efc6f5b 100644
7272
event.getProjectile().remove();
7373
return;
7474
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
75-
index 9b314eacc3..94fbac5e40 100644
75+
index 060671a58..13598e3bb 100644
7676
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
7777
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
7878
@@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess;
@@ -83,7 +83,7 @@ index 9b314eacc3..94fbac5e40 100644
8383
import net.minecraft.server.ItemActionContext;
8484
import net.minecraft.server.ItemStack;
8585
import net.minecraft.server.Items;
86-
@@ -465,16 +466,16 @@ public class CraftEventFactory {
86+
@@ -469,16 +470,16 @@ public class CraftEventFactory {
8787
/**
8888
* EntityShootBowEvent
8989
*/

‎Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 02746ee6554ae0bcbe0ac213ae6f23ee77bffa2a Mon Sep 17 00:00:00 2001
1+
From 7a96a2dfaadbf787727303f0241178e4d150bf75 Mon Sep 17 00:00:00 2001
22
From: Aikar <aikar@aikar.co>
33
Date: Tue, 3 Jul 2018 21:56:23 -0400
44
Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
77
to "confirm" things based on if it was player triggered close or not.
88

99
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
10-
index 3917980b76..007934d8c5 100644
10+
index 676349ca8..9cce323da 100644
1111
--- a/src/main/java/net/minecraft/server/EntityHuman.java
1212
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
1313
@@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index 3917980b76..007934d8c5 100644
3434
this.activeContainer = this.defaultContainer;
3535
}
3636
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
37-
index 774289a0f0..1e552b1a10 100644
37+
index 774289a0f..1e552b1a1 100644
3838
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
3939
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
4040
@@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index 774289a0f0..1e552b1a10 100644
8888
this.m();
8989
}
9090
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
91-
index 8757b6751e..4f04410f9b 100644
91+
index 8757b6751..4f04410f9 100644
9292
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
9393
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
9494
@@ -2039,7 +2039,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 8757b6751e..4f04410f9b 100644
101101
this.player.m();
102102
}
103103
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
104-
index 002f7e844a..fd0f5c6f29 100644
104+
index 002f7e844..fd0f5c6f2 100644
105105
--- a/src/main/java/net/minecraft/server/PlayerList.java
106106
+++ b/src/main/java/net/minecraft/server/PlayerList.java
107107
@@ -403,7 +403,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index 002f7e844a..fd0f5c6f29 100644
114114
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
115115
cserver.getPluginManager().callEvent(playerQuitEvent);
116116
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
117-
index 8a8c2eaf58..eb311a731f 100644
117+
index 8a8c2eaf5..eb311a731 100644
118118
--- a/src/main/java/net/minecraft/server/WorldServer.java
119119
+++ b/src/main/java/net/minecraft/server/WorldServer.java
120120
@@ -1027,7 +1027,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index 8a8c2eaf58..eb311a731f 100644
136136
}
137137
}
138138
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
139-
index cd8ad27047..e169679c88 100644
139+
index cd8ad2704..e169679c8 100644
140140
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
141141
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
142142
@@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index cd8ad27047..e169679c88 100644
155155
@Override
156156
public boolean isBlocking() {
157157
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
158-
index ebf025c8aa..ba4eb3726a 100644
158+
index ebf025c8a..ba4eb3726 100644
159159
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
160160
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
161161
@@ -780,7 +780,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,10 +168,10 @@ index ebf025c8aa..ba4eb3726a 100644
168168

169169
// Check if the fromWorld and toWorld are the same.
170170
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
171-
index 94fbac5e40..7967222d99 100644
171+
index 13598e3bb..bb48d44ff 100644
172172
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
173173
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
174-
@@ -1288,8 +1288,19 @@ public class CraftEventFactory {
174+
@@ -1292,8 +1292,19 @@ public class CraftEventFactory {
175175
return event;
176176
}
177177

‎Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 2a309ccd0cc41e615ba2c7455161ac1e4fc39449 Mon Sep 17 00:00:00 2001
1+
From afb3cf702e2707f26623277f245055f5a74269d0 Mon Sep 17 00:00:00 2001
22
From: Hugo Manrique <hugmanrique@gmail.com>
33
Date: Mon, 23 Jul 2018 14:22:26 +0200
44
Subject: [PATCH] Vanished players don't have rights
55

66

77
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
8-
index 3458333c9b..6ef5d2ebd7 100644
8+
index 3458333c9..6ef5d2ebd 100644
99
--- a/src/main/java/net/minecraft/server/Entity.java
1010
+++ b/src/main/java/net/minecraft/server/Entity.java
1111
@@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 3458333c9b..6ef5d2ebd7 100644
1818
protected int j;
1919
@Nullable
2020
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
21-
index 3a1ad2346b..9ab57be850 100644
21+
index 3a1ad2346..9ab57be85 100644
2222
--- a/src/main/java/net/minecraft/server/IBlockData.java
2323
+++ b/src/main/java/net/minecraft/server/IBlockData.java
2424
@@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -30,7 +30,7 @@ index 3a1ad2346b..9ab57be850 100644
3030
return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision);
3131
}
3232
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
33-
index ab875a7365..aed353365b 100644
33+
index ab875a736..aed353365 100644
3434
--- a/src/main/java/net/minecraft/server/ItemBlock.java
3535
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
3636
@@ -136,7 +136,8 @@ public class ItemBlock extends Item {
@@ -44,7 +44,7 @@ index ab875a7365..aed353365b 100644
4444

4545
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
4646
diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
47-
index 0f64a3c056..0f95bcbccb 100644
47+
index 0f64a3c05..0f95bcbcc 100644
4848
--- a/src/main/java/net/minecraft/server/VoxelShape.java
4949
+++ b/src/main/java/net/minecraft/server/VoxelShape.java
5050
@@ -46,6 +46,7 @@ public abstract class VoxelShape {
@@ -56,7 +56,7 @@ index 0f64a3c056..0f95bcbccb 100644
5656
return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2)));
5757
}
5858
diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
59-
index 143be566c6..08c83c62df 100644
59+
index 143be566c..08c83c62d 100644
6060
--- a/src/main/java/net/minecraft/server/VoxelShapes.java
6161
+++ b/src/main/java/net/minecraft/server/VoxelShapes.java
6262
@@ -33,6 +33,7 @@ public final class VoxelShapes {
@@ -76,7 +76,7 @@ index 143be566c6..08c83c62df 100644
7676
if (operatorboolean.apply(false, false)) {
7777
throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException());
7878
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
79-
index 307a2d060f..39e85f80ca 100644
79+
index c6f41d8a6..1fbecceb9 100644
8080
--- a/src/main/java/net/minecraft/server/World.java
8181
+++ b/src/main/java/net/minecraft/server/World.java
8282
@@ -164,6 +164,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -127,10 +127,10 @@ index 307a2d060f..39e85f80ca 100644
127127
public boolean p_() {
128128
return this.isClientSide;
129129
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
130-
index 7967222d99..e954c59d54 100644
130+
index bb48d44ff..d74c9d811 100644
131131
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
132132
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
133-
@@ -1166,6 +1166,14 @@ public class CraftEventFactory {
133+
@@ -1170,6 +1170,14 @@ public class CraftEventFactory {
134134
Projectile projectile = (Projectile) entity.getBukkitEntity();
135135
org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
136136
com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);

0 commit comments

Comments
 (0)