Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-04 07:17:46 +01:00
Code Issues Projects Releases Wiki Activity

Prevent teleporting dead entities (#2803)

Browse Source
This commit is contained in:
Shane Freeder 2020-03-03 05:28:35 +00:00
parent 8087b810b4
commit 9079e78a20
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/add-hand-to-BlockMultiPlaceEvent.patch
View File

@ -11,7 +11,7 @@ index fe2ec79dd..8460aa4f5 100644
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull; @@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
public class BlockMultiPlaceEvent extends BlockPlaceEvent { public class BlockMultiPlaceEvent extends BlockPlaceEvent {
private final List<BlockState> states; private final List<BlockState> states;
+ @Deprecated // Paper + @Deprecated // Paper
public BlockMultiPlaceEvent(@NotNull List<BlockState> states, @NotNull Block clicked, @NotNull ItemStack itemInHand, @NotNull Player thePlayer, boolean canBuild) { public BlockMultiPlaceEvent(@NotNull List<BlockState> states, @NotNull Block clicked, @NotNull ItemStack itemInHand, @NotNull Player thePlayer, boolean canBuild) {
- super(states.get(0).getBlock(), states.get(0), clicked, itemInHand, thePlayer, canBuild); - super(states.get(0).getBlock(), states.get(0), clicked, itemInHand, thePlayer, canBuild);
@ -25,6 +25,6 @@ index fe2ec79dd..8460aa4f5 100644
this.states = ImmutableList.copyOf(states); this.states = ImmutableList.copyOf(states);
+ //Paper end + //Paper end
} }
/** /**
-- --

22
Spigot-Server-Patches/Prevent-teleporting-dead-entities.patch Normal file
View File

@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 3 Mar 2020 05:26:40 +0000
Subject: [PATCH] Prevent teleporting dead entities
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 108377d76..c6bd62392 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set) {
+ if (player.dead) {
+ LOGGER.info("Attempt to teleport dead player %s restricted", player.getName());
+ return;
+ }
// CraftBukkit start
if (Float.isNaN(f)) {
f = 0;
--