mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-07 03:10:50 +01:00
67 lines
4.5 KiB
Diff
67 lines
4.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Sat, 9 Dec 2023 19:15:59 -0800
|
||
|
|
Subject: [PATCH] Fix NPE on null loc for EntityTeleportEvent
|
||
|
|
|
||
|
|
EntityTeleportEvent#setTo is marked as nullable and so is the
|
||
|
|
getTo method. This fixes the handling of a null "to" location
|
||
|
|
by treating it the same as the event being cancelled. This is
|
||
|
|
already existing behavior for the EntityPortalEvent (which
|
||
|
|
extends EntityTeleportEvent).
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/commands/TeleportCommand.java b/src/main/java/net/minecraft/server/commands/TeleportCommand.java
|
||
|
|
index 3fec07b250a8f145e30c8c41888e47d2a3c902e1..2ddd033e1c3a2e5c8950b93c838491923803ccce 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/commands/TeleportCommand.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/commands/TeleportCommand.java
|
||
|
|
@@ -169,9 +169,10 @@ public class TeleportCommand {
|
||
|
|
Location to = new Location(world.getWorld(), x, y, z, f2, f3);
|
||
|
|
EntityTeleportEvent event = new EntityTeleportEvent(target.getBukkitEntity(), target.getBukkitEntity().getLocation(), to);
|
||
|
|
world.getCraftServer().getPluginManager().callEvent(event);
|
||
|
|
- if (event.isCancelled()) {
|
||
|
|
+ if (event.isCancelled() || event.getTo() == null) { // Paper
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
+ to = event.getTo(); // Paper - actually track new location
|
||
|
|
|
||
|
|
x = to.getX();
|
||
|
|
y = to.getY();
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
index 96885946be3b8e129984353f3dfe4330e73ad84a..bc908b75cb99536df658281ae7f8b4eeedbbedc9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -4204,7 +4204,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||
|
|
if (!(this instanceof ServerPlayer)) {
|
||
|
|
EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.level().getWorld(), d3, d4, d5), new Location(this.level().getWorld(), d0, d6, d2));
|
||
|
|
this.level().getCraftServer().getPluginManager().callEvent(teleport);
|
||
|
|
- if (!teleport.isCancelled()) {
|
||
|
|
+ if (!teleport.isCancelled() && teleport.getTo() != null) { // Paper
|
||
|
|
Location to = teleport.getTo();
|
||
|
|
this.teleportTo(to.getX(), to.getY(), to.getZ());
|
||
|
|
} else {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
|
||
|
|
index 689bbc0feb700cfd6b10601d2c5a237ec40ed756..ca0a2191f5bfb3c44c1ddacab8b7a874c2f44cc1 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
|
||
|
|
@@ -129,7 +129,7 @@ public class FollowOwnerGoal extends Goal {
|
||
|
|
} else {
|
||
|
|
// CraftBukkit start
|
||
|
|
EntityTeleportEvent event = CraftEventFactory.callEntityTeleportEvent(this.tamable, (double) x + 0.5D, (double) y, (double) z + 0.5D);
|
||
|
|
- if (event.isCancelled()) {
|
||
|
|
+ if (event.isCancelled() || event.getTo() == null) { // Paper
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
Location to = event.getTo();
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||
|
|
index 06ab07fb5d8d0e2f97325890218a11fef551a0ba..b73dac8f68041f8a2e0752d70cc9d08b5cfd1cde 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||
|
|
@@ -408,7 +408,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
|
||
|
|
if (enumdirection != null) {
|
||
|
|
// CraftBukkit start
|
||
|
|
EntityTeleportEvent teleportEvent = CraftEventFactory.callEntityTeleportEvent(this, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ());
|
||
|
|
- if (teleportEvent.isCancelled()) {
|
||
|
|
+ if (teleportEvent.isCancelled() || teleportEvent.getTo() == null) { // Paper
|
||
|
|
return false;
|
||
|
|
} else {
|
||
|
|
blockposition1 = CraftLocation.toBlockPosition(teleportEvent.getTo());
|