Several fixes and new api for experience merging/stacking (#9242)

1 files changed, 50 insertions, 0 deletions

diff --git a/patches/server/0596-Add-back-EntityPortalExitEvent.patch b/patches/server/0596-Add-back-EntityPortalExitEvent.patch
new file mode 100644
index 0000000000..5a83bce11c
--- /dev/null
+++ b/patches/server/0596-Add-back-EntityPortalExitEvent.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 16 May 2021 09:39:46 -0700
+Subject: [PATCH] Add back EntityPortalExitEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 325d8551d4f6c1d24525fab607769a75320cf436..2d98bdae7e8686d8a15e8938a16d8d63f0575bef 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3312,6 +3312,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+             } else {
+                 // CraftBukkit start
+                 worldserver = shapedetectorshape.world;
++                // Paper start - Call EntityPortalExitEvent
++                Vec3 position = shapedetectorshape.pos;
++                float yaw = shapedetectorshape.yRot;
++                float pitch = this.getXRot(); // Keep entity pitch as per moveTo line below
++                Vec3 velocity = shapedetectorshape.speed;
++                CraftEntity bukkitEntity = this.getBukkitEntity();
++                org.bukkit.event.entity.EntityPortalExitEvent event = new org.bukkit.event.entity.EntityPortalExitEvent(bukkitEntity,
++                    bukkitEntity.getLocation(), new Location(worldserver.getWorld(), position.x, position.y, position.z, yaw, pitch),
++                    bukkitEntity.getVelocity(), org.bukkit.craftbukkit.util.CraftVector.toBukkit(shapedetectorshape.speed));
++                event.callEvent();
++                if (this.isRemoved()) {
++                    return null;
++                }
++
++                if (!event.isCancelled() && event.getTo() != null) {
++                    worldserver = ((CraftWorld) event.getTo().getWorld()).getHandle();
++                    position = CraftLocation.toVec3D(event.getTo());
++                    yaw = event.getTo().getYaw();
++                    pitch = event.getTo().getPitch();
++                    velocity = org.bukkit.craftbukkit.util.CraftVector.toNMS(event.getAfter());
++                }
++                // Paper end - Call EntityPortalExitEvent
+                 if (worldserver == this.level) {
+                     // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in
+                     this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot);
+@@ -3331,8 +3353,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+                 if (entity != null) {
+                     entity.restoreFrom(this);
+-                    entity.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, entity.getXRot());
+-                    entity.setDeltaMovement(shapedetectorshape.speed);
++                    entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - EntityPortalExitEvent
++                    entity.setDeltaMovement(velocity); // Paper - EntityPortalExitEvent
+                     // CraftBukkit start - Don't spawn the new entity if the current entity isn't spawned
+                     if (this.inWorld) {
+                         worldserver.addDuringTeleport(entity);