Upstream/WildLoaders
1
0
Fork 0
mirror of https://github.com/BG-Software-LLC/WildLoaders.git synced 2024-09-21 03:21:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Potential fix for removing npcs while entity ticking is occurring error

Browse Source
This commit is contained in:
OmerBenGera 2021-02-14 15:44:27 +02:00
parent 30db9d6480
commit 8edfae054e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/ChunkLoaderNPC_v1_16_R3.java
View File

@ -3,6 +3,7 @@ package com.bgsoftware.wildloaders.nms;
import com.bgsoftware.wildloaders.api.npc.ChunkLoaderNPC;
import com.bgsoftware.wildloaders.npc.DummyChannel;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.v1_16_R3.Chunk;
import net.minecraft.server.v1_16_R3.EntityPlayer;
import net.minecraft.server.v1_16_R3.EnumGamemode;
import net.minecraft.server.v1_16_R3.EnumProtocolDirection;
@ -58,7 +59,7 @@ public final class ChunkLoaderNPC_v1_16_R3 extends EntityPlayer implements Chunk
public void die() {
if(!dieCall) {
dieCall = true;
getWorldServer().removePlayer(this);
removePlayer(getWorldServer(), this);
dieCall = false;
}
else {
@ -71,6 +72,16 @@ public final class ChunkLoaderNPC_v1_16_R3 extends EntityPlayer implements Chunk
return getBukkitEntity().getLocation();
}
private static void removePlayer(WorldServer worldServer, EntityPlayer entityPlayer){
Chunk currentChunk = entityPlayer.getCurrentChunk();
if (currentChunk != null)
currentChunk.b(entityPlayer);
worldServer.entitiesById.remove(entityPlayer.getId());
worldServer.unregisterEntity(entityPlayer);
entityPlayer.shouldBeRemoved = true;
}
private static class DummyNetworkManager extends NetworkManager{
DummyNetworkManager(){