From c11da48fc2d1e33437a11376d1bcede0dbe05d59 Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 28 Dec 2022 23:14:41 +0800 Subject: [PATCH] Set nophysics flag on setGameMode --- .../citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java | 7 +++++++ .../citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java | 7 +++++++ .../java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java | 1 - .../citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java | 7 +++++++ 12 files changed, 77 insertions(+), 1 deletion(-) diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java index 9cccc09ae..f2ab4c1a5 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_10_R1.CraftServer; import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer; @@ -507,6 +508,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java index eba79285f..cc600a21f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_11_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer; @@ -514,6 +515,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java index 981394d61..20bb17e8c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; @@ -540,6 +541,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java index 59d411300..73ecc0ada 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer; @@ -541,6 +542,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java index a56dc960b..2fcdb20b3 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_14_R1.CraftServer; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; @@ -536,6 +537,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java index 26bf7fea1..6025d1601 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_15_R1.CraftServer; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; @@ -546,6 +547,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java index d78628a04..dea54a0b4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_16_R3.CraftServer; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; @@ -578,6 +579,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java index 0ebcc767e..814884747 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_17_R1.CraftServer; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer; @@ -585,6 +586,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noPhysics = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java index 4b910a692..ad64b6f75 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_18_R2.CraftServer; import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer; @@ -591,6 +592,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noPhysics = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java index bc7b0ee3f..1a253e578 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_19_R2.CraftServer; import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; @@ -616,6 +617,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable ((CraftServer) Bukkit.getServer()).getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noPhysics = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { ((CraftServer) Bukkit.getServer()).getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java index 4f8ff44c6..c552aeafe 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java @@ -353,7 +353,6 @@ public class NMSImpl implements NMSBridge { @Override public boolean addEntityToWorld(org.bukkit.entity.Entity entity, SpawnReason custom) { int viewDistance = -1; - ChunkMap chunkMap = null; try { if (entity instanceof Player) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java index 17368671f..b9e03ac95 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.CraftServer; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; @@ -497,6 +498,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } + @Override + public void setGameMode(GameMode mode) { + super.setGameMode(mode); + getHandle().noclip = mode == GameMode.SPECTATOR; + } + @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue);