OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-02 17:32:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-7761: Ender pearl does not damage or spawn endermites

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-06-15 18:47:12 +10:00
parent 7feadbf2ee
commit 199310d0bd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-server/nms-patches/net/minecraft/server/network/PlayerConnection.patch
View file

@ -566,7 +566,7 @@
+ // SPIGOT-5171: Triggered on join
+ if (from.equals(to)) {
+ this.internalTeleport(d0, d1, d2, f, f1, set);
+ return false; // CraftBukkit - Return event status
+ return true; // CraftBukkit - Return event status
+ }
+
+ PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause);
@ -583,7 +583,7 @@
+ }
+
+ this.internalTeleport(d0, d1, d2, f, f1, set);
+ return event.isCancelled(); // CraftBukkit - Return event status
+ return !event.isCancelled(); // CraftBukkit - Return event status
+ }
+
+ public void teleport(Location dest) {

2
paper-server/nms-patches/net/minecraft/world/entity/EntityLiving.patch
View file

@ -1062,7 +1062,7 @@
+ }
+ } else {
+ // player teleport event is called in the underlining code
+ if (((EntityPlayer) this).connection.teleport(d0, d6, d2, this.getYRot(), this.getXRot(), java.util.Collections.emptySet(), cause)) {
+ if (!((EntityPlayer) this).connection.teleport(d0, d6, d2, this.getYRot(), this.getXRot(), java.util.Collections.emptySet(), cause)) {
+ return Optional.empty();
+ }
+ }