OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-14 05:33:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE on null loc for EntityTeleportEvent

Browse source 
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).
This commit is contained in:
Jake Potrebic 2023-12-09 19:15:59 -08:00
parent 5b1ab02f39
commit 15fcde4b3c
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
paper-server/patches/sources/net/minecraft/server/commands/TeleportCommand.java.patch
View file

@ -20,7 +20,7 @@
public class TeleportCommand {
@@ -167,7 +173,30 @@
@@ -167,7 +173,31 @@
float f4 = Mth.wrapDegrees(f2);
float f5 = Mth.wrapDegrees(f3);
@ -33,9 +33,10 @@
+ Location to = new Location(world.getWorld(), d3, d4, d5, f4, f5);
+ 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
+
+ d3 = to.getX();
+ d4 = to.getY();

2
paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file

@ -1856,7 +1856,7 @@
+ 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 {

2
paper-server/patches/sources/net/minecraft/world/entity/TamableAnimal.java.patch
View file

@ -74,7 +74,7 @@
- this.moveTo((double) x + 0.5D, (double) y, (double) z + 0.5D, this.getYRot(), this.getXRot());
+ // CraftBukkit start
+ EntityTeleportEvent event = CraftEventFactory.callEntityTeleportEvent(this, (double) x + 0.5D, (double) y, (double) z + 0.5D);
+ if (event.isCancelled()) {
+ if (event.isCancelled() || event.getTo() == null) { // Paper - prevent NP on null event to location
+ return false;
+ }
+ Location to = event.getTo();

2
paper-server/patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch
View file

@ -34,7 +34,7 @@
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());