72 lines
4.3 KiB
Diff
72 lines
4.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||
|
|
Date: Tue, 11 Feb 2020 21:56:48 -0600
|
||
|
|
Subject: [PATCH] EntityMoveEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
index fe02a46df9c652acf4a4bc0ed194522f400cda34..454bc4c7b2e54a75dd0510263165e41cf26b1751 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
@@ -13,6 +13,7 @@ import io.netty.buffer.ByteBuf;
|
||
|
|
import io.netty.buffer.ByteBufOutputStream;
|
||
|
|
import io.netty.buffer.Unpooled;
|
||
|
|
import io.papermc.paper.adventure.PaperAdventure; // Paper
|
||
|
|
+import io.papermc.paper.event.entity.EntityMoveEvent;
|
||
|
|
import it.unimi.dsi.fastutil.longs.LongIterator;
|
||
|
|
import java.awt.image.BufferedImage;
|
||
|
|
import java.io.BufferedWriter;
|
||
|
|
@@ -1460,6 +1461,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||
|
|
while (iterator.hasNext()) {
|
||
|
|
WorldServer worldserver = (WorldServer) iterator.next();
|
||
|
|
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
|
||
|
|
+ worldserver.hasEntityMoveEvent = EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
|
||
|
|
TileEntityHopper.skipHopperEvents = worldserver.paperConfig.disableHopperMoveEvents || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
|
||
|
|
|
||
|
|
this.methodProfiler.a(() -> {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||
|
|
index ac62e4e6842a474a1284ae7ac8890cc00b55aa64..9720f60d6a58df5f5a9b2c92e2209537aab7f010 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
||
|
|
@@ -213,6 +213,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
||
|
|
public final Convertable.ConversionSession convertable;
|
||
|
|
public final UUID uuid;
|
||
|
|
public boolean hasPhysicsEvent = true; // Paper
|
||
|
|
+ public boolean hasEntityMoveEvent = false; // Paper
|
||
|
|
private static Throwable getAddToWorldStackTrace(Entity entity) {
|
||
|
|
return new Throwable(entity + " Added to world at " + new java.util.Date());
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
index b1adb0ddfeb94de6f92f40a7e9e586e00455160d..78d874c44cf8311af06b085db12fbe0cacd6cf7d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
@@ -10,6 +10,7 @@ import com.mojang.datafixers.util.Pair;
|
||
|
|
import com.mojang.serialization.DataResult;
|
||
|
|
import com.mojang.serialization.Dynamic;
|
||
|
|
import com.mojang.serialization.DynamicOps;
|
||
|
|
+import io.papermc.paper.event.entity.EntityMoveEvent;
|
||
|
|
import java.util.Collection;
|
||
|
|
import java.util.ConcurrentModificationException;
|
||
|
|
import java.util.Iterator;
|
||
|
|
@@ -2912,6 +2913,20 @@ public abstract class EntityLiving extends Entity {
|
||
|
|
|
||
|
|
this.collideNearby();
|
||
|
|
this.world.getMethodProfiler().exit();
|
||
|
|
+ // Paper start
|
||
|
|
+ if (((WorldServer) world).hasEntityMoveEvent) {
|
||
|
|
+ if (lastX != locX() || lastY != locY() || lastZ != locZ() || lastYaw != yaw || lastPitch != pitch) {
|
||
|
|
+ Location from = new Location(world.getWorld(), lastX, lastY, lastZ, lastYaw, lastPitch);
|
||
|
|
+ Location to = new Location (world.getWorld(), locX(), locY(), locZ(), yaw, pitch);
|
||
|
|
+ EntityMoveEvent event = new EntityMoveEvent(getBukkitLivingEntity(), from, to.clone());
|
||
|
|
+ if (!event.callEvent()) {
|
||
|
|
+ setLocation(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch());
|
||
|
|
+ } else if (!to.equals(event.getTo())) {
|
||
|
|
+ setLocation(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
if (!this.world.isClientSide && this.dO() && this.aG()) {
|
||
|
|
this.damageEntity(DamageSource.DROWN, 1.0F);
|
||
|
|
}
|