Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-21 03:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Simplify inBlock check to avoid chunk loading

Browse Source
This commit is contained in:
fullwall 2020-11-14 17:27:54 +08:00
parent d3002965fd
commit dffbf60465
8 changed files with 121 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
View File

@ -7,6 +7,8 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -242,6 +244,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
return skinTracker;
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;

15
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
View File

@ -7,6 +7,8 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -273,6 +275,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
return skinTracker;
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;

15
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
View File

@ -8,6 +8,8 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -293,6 +295,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
return skinTracker;
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;

15
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
View File

@ -8,6 +8,8 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -272,6 +274,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
return skinTracker;
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;

15
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
View File

@ -7,6 +7,8 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -263,6 +265,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
return skinTracker;
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;

15
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
View File

@ -7,6 +7,8 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -264,6 +266,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
// cancelled.
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;

17
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java
View File

@ -9,6 +9,8 @@ import java.util.function.Consumer;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -278,6 +280,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
// cancelled.
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;
@ -376,7 +391,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
super.playerTick();
return;
}
noclip = true;
entityBaseTick();
noclip = false;
boolean navigating = npc.getNavigator().isNavigating();
if (!navigating && getBukkitEntity() != null
&& (!npc.hasTrait(Gravity.class) || npc.getOrAddTrait(Gravity.class).hasGravity())

14
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
@ -243,6 +244,19 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
return skinTracker;
}
@Override
public boolean inBlock() {
if (npc == null || noclip) {
return super.inBlock();
}
Location loc = getBukkitEntity().getLocation(LOADED_LOCATION);
if (!Util.isLoaded(loc)) {
return false;
}
org.bukkit.block.Block in = loc.getBlock();
return in.getType().isSolid() && in.getRelative(BlockFace.UP).getType().isSolid();
}
private void initialise(MinecraftServer minecraftServer) {
Socket socket = new EmptySocket();
NetworkManager conn = null;