Skip to content
Permalink
Browse files

Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
ff0672ca SPIGOT-5211: Add Raid API

CraftBukkit Changes:
96bc85f0 SPIGOT-5298: Remove unexplained 0.1 drop chance offset
6ed8a189 SPIGOT-5290: Invulnerable and/or Marker armor stand triggers EntityDamageEvent
631eaeb0 SPIGOT-5297: PlayerBedLeaveEvent.getBed() returns player location
8d4bc541 SPIGOT-5293: Sponge behaviour differs from Vanilla
e91fd75e SPIGOT-5291: Missing event for ravagers trampling crops
cbdd7139 SPIGOT-5211: Add Raid API
edd8fdfb SPIGOT-5287: Fix rare CME generating new chunks
3fc97f08 SPIGOT-5265: FireworkExplodeEvent only fired when rockets explode in air

Spigot Changes:
065a3734 Rebuild patches
a5961826 SPIGOT-5286: tick-inactive-villagers invokes the AI for NoAI villagers
  • Loading branch information...
electronicboy committed Aug 31, 2019
1 parent aba4969 commit c9fd745840d8b9e6515cbc9996362a03a33fdcdf
Showing with 148 additions and 161 deletions.
  1. +4 −4 Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
  2. +4 −4 Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
  3. +3 −3 Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
  4. +4 −4 Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch
  5. +9 −9 Spigot-Server-Patches/0139-Firework-API-s.patch
  6. +4 −4 Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch
  7. +4 −4 Spigot-Server-Patches/0144-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
  8. +5 −5 Spigot-Server-Patches/0148-Do-not-let-armorstands-drown.patch
  9. +3 −3 Spigot-Server-Patches/0183-Option-for-maximum-exp-value-when-merging-orbs.patch
  10. +3 −3 Spigot-Server-Patches/0191-ExperienceOrbMergeEvent.patch
  11. +3 −3 Spigot-Server-Patches/0222-Expand-World.spawnParticle-API-and-add-Builder.patch
  12. +4 −4 Spigot-Server-Patches/0226-Allow-spawning-Item-entities-with-World.spawnEntity.patch
  13. +4 −4 Spigot-Server-Patches/0236-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
  14. +4 −4 Spigot-Server-Patches/0240-Expand-Explosions-API.patch
  15. +4 −4 Spigot-Server-Patches/0244-Implement-World.getEntity-UUID-API.patch
  16. +4 −4 Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
  17. +3 −3 Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch
  18. +6 −6 Spigot-Server-Patches/0268-Ignore-Dead-Entities-in-entityList-iteration.patch
  19. +4 −4 Spigot-Server-Patches/0275-Add-hand-to-bucket-events.patch
  20. +8 −8 Spigot-Server-Patches/0284-Allow-disabling-armour-stand-ticking.patch
  21. +3 −3 Spigot-Server-Patches/0286-Send-nearby-packets-from-world-player-list-not-serve.patch
  22. +4 −4 Spigot-Server-Patches/0297-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
  23. +16 −16 Spigot-Server-Patches/0300-Improve-death-events.patch
  24. +4 −4 Spigot-Server-Patches/0318-Add-sun-related-API.patch
  25. +5 −5 Spigot-Server-Patches/0337-Fix-SpongeAbsortEvent-handling.patch
  26. +4 −4 Spigot-Server-Patches/0376-Add-Heightmap-API.patch
  27. +4 −4 Spigot-Server-Patches/0385-improve-CraftWorld-isChunkLoaded.patch
  28. +3 −3 Spigot-Server-Patches/0386-Configurable-Keep-Spawn-Loaded-range-per-world.patch
  29. +4 −17 Spigot-Server-Patches/0387-Fix-some-generation-concurrency-issues.patch
  30. +5 −5 Spigot-Server-Patches/0394-Fix-World-isChunkGenerated-calls.patch
  31. +6 −6 Spigot-Server-Patches/0410-Asynchronous-chunk-IO-and-loading.patch
  32. +1 −1 work/Bukkit
  33. +1 −1 work/CraftBukkit
  34. +1 −1 work/Spigot
@@ -1,4 +1,4 @@
From 8a82f8ccee640794c614900f956276e5e64cf3f0 Mon Sep 17 00:00:00 2001
From 336ebd0ca73ac288512ec519770bc0f371b811a7 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:30 -0700
Subject: [PATCH] Add EntityZapEvent
@@ -22,7 +22,7 @@ index ee5bfd6f0..7136e274a 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 ba0386ad4..09d12d1fc 100644
index 89065deb4..dcd02930d 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -693,6 +693,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,10 +39,10 @@ index ba0386ad4..09d12d1fc 100644
entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (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 8a170c77c..562e692b2 100644
index 4623201ee..aa0048b57 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1009,6 +1009,14 @@ public class CraftEventFactory {
@@ -1018,6 +1018,14 @@ public class CraftEventFactory {
return event;
}

@@ -1,4 +1,4 @@
From c36c80530c089b059444fbfb983937b30010b9d4 Mon Sep 17 00:00:00 2001
From 4de4e4b1b22b8739b092ced032b1c33414828f9a Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Thu, 8 Sep 2016 08:48:33 -0700
Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -18,18 +18,18 @@ index 332dc0e53..eec6de9ad 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 562e692b2..e3d1135de 100644
index aa0048b57..b3939c0f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -106,6 +106,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion;
import org.bukkit.entity.Vehicle;
import org.bukkit.entity.Villager;
import org.bukkit.entity.Villager.Profession;
+import org.bukkit.entity.ExperienceOrb; // Paper
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.Event.Result;
@@ -968,6 +969,17 @@ public class CraftEventFactory {
@@ -977,6 +978,17 @@ public class CraftEventFactory {
return event;
}

@@ -1,4 +1,4 @@
From 52fe7dbe4a7ee6ec1e8f11d21e003e2f0b87b6f5 Mon Sep 17 00:00:00 2001
From 62cf55a377acc3950a4485dcd2a5389f3096cd6b Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Fri, 16 Dec 2016 21:25:39 -0600
Subject: [PATCH] Add ProjectileCollideEvent
@@ -93,10 +93,10 @@ index d1710259c..5f0cb4c33 100644
this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
} else {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index e3d1135de..a59e35040 100644
index b3939c0f2..0202c7662 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1113,6 +1113,16 @@ public class CraftEventFactory {
@@ -1122,6 +1122,16 @@ public class CraftEventFactory {
return CraftItemStack.asNMSCopy(bitem);
}

@@ -1,11 +1,11 @@
From f35ea1e0498c253d3e0d72ed12413b2ca1ea2f5a Mon Sep 17 00:00:00 2001
From acb6a2a74f23b56bdaa44797acc636ebfec78049 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:47:25 -0600
Subject: [PATCH] Add API methods to control if armour stands can move


diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 6561dc637..dbc75382a 100644
index 2e7d966c2..3e78b152f 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -16,7 +16,7 @@ index 6561dc637..dbc75382a 100644

public EntityArmorStand(EntityTypes<? extends EntityArmorStand> entitytypes, World world) {
super(entitytypes, world);
@@ -796,4 +797,13 @@ public class EntityArmorStand extends EntityLiving {
@@ -801,4 +802,13 @@ public class EntityArmorStand extends EntityLiving {

return this.getEntityType().k().a(f);
}
@@ -52,5 +52,5 @@ index 2b66a08ad..124c3185b 100644
+ // Paper end
}
--
2.22.0
2.23.0

@@ -1,11 +1,11 @@
From 5cc70c7a81386cc66cead409e9f0e90d4ccd07af Mon Sep 17 00:00:00 2001
From 76db7975abcdafa9fcfec1b5448d2bde8f9b4cff Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 28 Dec 2016 07:18:33 +0100
Subject: [PATCH] Firework API's


diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
index fd3897c056..3cf3b1c174 100644
index 8f4116cde..dbbb96ac5 100644
--- a/src/main/java/net/minecraft/server/EntityFireworks.java
+++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -27,7 +27,7 @@ index fd3897c056..3cf3b1c174 100644

public EntityFireworks(EntityTypes<? extends EntityFireworks> entitytypes, World world) {
super(entitytypes, world);
@@ -263,6 +266,11 @@ public class EntityFireworks extends Entity implements IProjectile {
@@ -271,6 +274,11 @@ public class EntityFireworks extends Entity implements IProjectile {
}

nbttagcompound.setBoolean("ShotAtAngle", (Boolean) this.datawatcher.get(EntityFireworks.d));
@@ -39,7 +39,7 @@ index fd3897c056..3cf3b1c174 100644
}

@Override
@@ -278,7 +286,11 @@ public class EntityFireworks extends Entity implements IProjectile {
@@ -286,7 +294,11 @@ public class EntityFireworks extends Entity implements IProjectile {
if (nbttagcompound.hasKey("ShotAtAngle")) {
this.datawatcher.set(EntityFireworks.d, nbttagcompound.getBoolean("ShotAtAngle"));
}
@@ -53,7 +53,7 @@ index fd3897c056..3cf3b1c174 100644

@Override
diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
index 28d7fdeef8..874d9f500e 100644
index 28d7fdeef..874d9f500 100644
--- a/src/main/java/net/minecraft/server/ItemCrossbow.java
+++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
@@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -65,7 +65,7 @@ index 28d7fdeef8..874d9f500e 100644
object = a(world, entityliving, itemstack, itemstack1);
if (flag || f3 != 0.0F) {
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index 37caa79cba..aea46ffae5 100644
index 37caa79cb..aea46ffae 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -17,6 +17,7 @@ public class ItemFireworks extends Item {
@@ -90,7 +90,7 @@ index 37caa79cba..aea46ffae5 100644
itemstack.subtract(1);
}
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
index 3f6d2676e7..b1fd18151b 100644
index 3f6d2676e..b1fd18151 100644
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
@@ -112,7 +112,7 @@ public class NBTTagCompound implements NBTBase {
@@ -103,7 +103,7 @@ index 3f6d2676e7..b1fd18151b 100644
}

diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
index d3cbad9a5c..219a1e4c0d 100644
index d3cbad9a5..219a1e4c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
@@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity;
@@ -145,5 +145,5 @@ index d3cbad9a5c..219a1e4c0d 100644
+ // Paper end
}
--
2.22.0
2.23.0

@@ -1,4 +1,4 @@
From 5d5f94cde1d2c983ddce06a462201aec17641069 Mon Sep 17 00:00:00 2001
From e611d31aee9dacc9acc8871e1a1df9d403f941aa Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:24:46 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 13f2dbdd6..2087a38a2 100644
index a5abc0717..75a3a8a88 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -271,6 +271,48 @@ public class CraftWorld implements World {
@@ -273,6 +273,48 @@ public class CraftWorld implements World {
private int waterAnimalSpawn = -1;
private int ambientSpawn = -1;

@@ -60,5 +60,5 @@ index 13f2dbdd6..2087a38a2 100644

public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
--
2.22.0
2.23.0

@@ -1,4 +1,4 @@
From af6b0e1caa5ecd670c1e88b8ee4f1a3161b4d2e1 Mon Sep 17 00:00:00 2001
From c3b79911080cb54b76b5fa9fe4008855c258b7aa Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:31:46 -0500
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -187,7 +187,7 @@ index 25c7214de..594cc70de 100644

}
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 09d12d1fc..a4033a666 100644
index dcd02930d..8a5127c5d 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -504,7 +504,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -265,10 +265,10 @@ index 0cb2e6d87..2bbd3663a 100644

}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5b48bbdfb..75f5e752c 100644
index 75a3a8a88..8798ecae3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1711,7 +1711,7 @@ public class CraftWorld implements World {
@@ -1713,7 +1713,7 @@ public class CraftWorld implements World {
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
entity = new EntityTNTPrimed(world, x, y, z, null);
} else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@@ -1,14 +1,14 @@
From adba45d168b214c08095f750fe909b28608806b4 Mon Sep 17 00:00:00 2001
From 2f2e638edbbacbf9356bc1679b56ac781e14df12 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 18 Feb 2017 19:29:58 -0600
Subject: [PATCH] Do not let armorstands drown


diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index dbc75382a..f7e593afe 100644
index 3e78b152f..9e6633a1b 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -805,5 +805,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -810,5 +810,10 @@ public class EntityArmorStand extends EntityLiving {
super.move(moveType, vec3d);
}
}
@@ -20,7 +20,7 @@ index dbc75382a..f7e593afe 100644
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 537781e29..abd96b2c4 100644
index 79edb3b3c..a016cbb21 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -223,6 +223,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 537781e29..abd96b2c4 100644
if (this.getAirTicks() == -20) {
this.setAirTicks(0);
--
2.22.0
2.23.0

@@ -1,4 +1,4 @@
From 4818fe6917efb325af39b9b2b6a14128c75e1621 Mon Sep 17 00:00:00 2001
From 7b7485a91475522cb0fe168bb65e6ec55c1caab6 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 10 Nov 2017 23:03:12 -0500
Subject: [PATCH] Option for maximum exp value when merging orbs
@@ -20,10 +20,10 @@ index 4d0d4cbe4..b3d8fe9c6 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a59e35040..81c0c8cf7 100644
index 0202c7662..5257941e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -528,16 +528,32 @@ public class CraftEventFactory {
@@ -537,16 +537,32 @@ public class CraftEventFactory {
EntityExperienceOrb xp = (EntityExperienceOrb) entity;
double radius = world.spigotConfig.expMerge;
if (radius > 0) {
@@ -1,4 +1,4 @@
From f05b3edd7d2fe3bf084677bbe89f3ef983118838 Mon Sep 17 00:00:00 2001
From 782fe85c988f7dff4bd866321a742aad5865e93d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 81c0c8cf7..95a0364f3 100644
index 5257941e9..489943410 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -538,7 +538,7 @@ public class CraftEventFactory {
@@ -547,7 +547,7 @@ public class CraftEventFactory {
if (e instanceof EntityExperienceOrb) {
EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
// Paper start
@@ -1,4 +1,4 @@
From 3d5c1c4a2c091d1c649e9c7756ecc8b7942b1d28 Mon Sep 17 00:00:00 2001
From 13bd7215a2ea91d0707bf7c417287ac9679de28c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 15 Aug 2017 22:29:12 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -43,10 +43,10 @@ index 594401c39..cbabe7743 100644

if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 75f5e752c..a0c5f7f91 100644
index 8798ecae3..16de4efef 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2177,11 +2177,17 @@ public class CraftWorld implements World {
@@ -2179,11 +2179,17 @@ public class CraftWorld implements World {

@Override
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
@@ -1,4 +1,4 @@
From 030a17b8b5f1d5b6abd32d88f1fd26fa4ac3f52d Mon Sep 17 00:00:00 2001
From f498a1a83a6ead6408383a780c51342aa5b78e71 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Jun 2018 20:39:20 -0400
Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
Item can be set inside of the Consumer pre spawn function.

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a0c5f7f91..2fac4462d 100644
index 16de4efef..00ce2fecf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1405,6 +1405,10 @@ public class CraftWorld implements World {
@@ -1407,6 +1407,10 @@ public class CraftWorld implements World {
if (Boat.class.isAssignableFrom(clazz)) {
entity = new EntityBoat(world, x, y, z);
entity.setPositionRotation(x, y, z, yaw, pitch);
@@ -23,5 +23,5 @@ index a0c5f7f91..2fac4462d 100644
entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
} else if (Projectile.class.isAssignableFrom(clazz)) {
--
2.22.0
2.23.0

@@ -1,4 +1,4 @@
From b1e611afbfb191ac83c8ef7546facf7951a036f1 Mon Sep 17 00:00:00 2001
From e7101a32d4ccec5fe80bcf9578bc6abea64e56ec Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 15 Jun 2013 19:51:17 -0400
Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -72,18 +72,18 @@ index 874d9f500..f0d784108 100644
event.getProjectile().remove();
return;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 95a0364f3..d423150ee 100644
index 489943410..e58dac2c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -50,6 +50,7 @@ import net.minecraft.server.GeneratorAccess;
@@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess;
import net.minecraft.server.IBlockData;
import net.minecraft.server.IChatBaseComponent;
import net.minecraft.server.IInventory;
+import net.minecraft.server.IProjectile;
import net.minecraft.server.ItemActionContext;
import net.minecraft.server.ItemStack;
import net.minecraft.server.Items;
@@ -456,16 +457,16 @@ public class CraftEventFactory {
@@ -465,16 +466,16 @@ public class CraftEventFactory {
/**
* EntityShootBowEvent
*/

0 comments on commit c9fd745

Please sign in to comment.
You can’t perform that action at this time.