core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0095-Don-t-teleport-dead-en...

25 lines
1010 B
Diff
Raw Normal View History

Optimize isInvalidYLocation, getType and getBlockData Some pretty micro optimizations, but this is the hottest method in the server.... This will drastically reduce number of operations to perform getType the 2 previous patches was squashed into 1
2016-06-23 02:43:02 +00:00
From 14040aaa93730c538cd6b521cf1ed838475a21d6 Mon Sep 17 00:00:00 2001
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed.
2016-03-22 04:56:09 +00:00
From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:55:23 -0400
Subject: [PATCH] Don't teleport dead entities
Had some issue with this in past, and this is the vanilla logic.
Potentially an old CB change that's no longer needed.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
Fix missed case in top of nether void damage patch General cleanup, etc. Closes GH-343
2016-06-18 05:25:37 +00:00
index 3d5a23c..3ed3732 100644
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed.
2016-03-22 04:56:09 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Fix missed case in top of nether void damage patch General cleanup, etc. Closes GH-343
2016-06-18 05:25:37 +00:00
@@ -2144,7 +2144,7 @@ public abstract class Entity implements ICommandListener {
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed.
2016-03-22 04:56:09 +00:00
}
public Entity teleportTo(Location exit, boolean portal) {
- if (true) {
+ if (!this.dead) { // Paper
WorldServer worldserver = ((CraftWorld) getBukkitEntity().getLocation().getWorld()).getHandle();
WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
int i = worldserver1.dimension;
--
Update upstream
2016-06-23 02:18:41 +00:00
2.9.0
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed.
2016-03-22 04:56:09 +00:00