Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
md_5 2024-06-15 18:47:12 +10:00
parent f5a63f7345
commit 6ce1726424
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,7 +566,7 @@
+ // SPIGOT-5171: Triggered on join + // SPIGOT-5171: Triggered on join
+ if (from.equals(to)) { + if (from.equals(to)) {
+ this.internalTeleport(d0, d1, d2, f, f1, set); + 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); + PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause);
@ -583,7 +583,7 @@
+ } + }
+ +
+ this.internalTeleport(d0, d1, d2, f, f1, set); + 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) { + public void teleport(Location dest) {

2
nms-patches/net/minecraft/world/entity/EntityLiving.patch
View File

@ -1062,7 +1062,7 @@
+ } + }
+ } else { + } else {
+ // player teleport event is called in the underlining code + // 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(); + return Optional.empty();
+ } + }
+ } + }