Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backport bukkitEntity change

This commit is contained in:
fullwall 2021-09-27 20:50:38 +08:00
parent cfacb52d29
commit fd3833deba
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java
View File

@ -93,7 +93,6 @@ public class HumanController extends AbstractEntityController {
npc.getSkinTracker().onRemoveNPC();
}
NMS.remove(entity);
// Paper decided to break Spigot compatibility.
// super.remove();
setEntity(null);
}
}

3
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java
View File

@ -93,7 +93,6 @@ public class HumanController extends AbstractEntityController {
npc.getSkinTracker().onRemoveNPC();
}
NMS.remove(entity);
// Paper decided to break Spigot compatibility.
// super.remove();
setEntity(null);
}
}

3
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java
View File

@ -93,7 +93,6 @@ public class HumanController extends AbstractEntityController {
npc.getSkinTracker().onRemoveNPC();
}
NMS.remove(entity);
// Paper decided to break Spigot compatibility.
// super.remove();
setEntity(null);
}
}

3
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java
View File

@ -92,7 +92,6 @@ public class HumanController extends AbstractEntityController {
npc.getSkinTracker().onRemoveNPC();
}
NMS.remove(entity);
// Paper decided to break Spigot compatibility.
// super.remove();
setEntity(null);
}
}

4
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java
View File

@ -90,8 +90,6 @@ public class HumanController extends AbstractEntityController {
npc.getSkinTracker().onRemoveNPC();
}
NMS.remove(entity);
super.setEntity(null);
// Paper decided to break Spigot compatibility.
// super.remove();
setEntity(null);
}
}