Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-28 23:27:40 +02:00
Code Issues Projects Releases Wiki Activity

Fix /npc inventory, validate /npc mount --onnpc, add an attempt to fix movement when an NPC has a passenger

Browse Source
This commit is contained in:
fullwall 2016-04-01 11:49:32 +08:00
parent e103d8e612
commit 1a891ecd75
4 changed files with 337 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -686,7 +686,7 @@ public class NPCCommands {
max = 1,
permission = "citizens.npc.inventory")
public void inventory(CommandContext args, CommandSender sender, NPC npc) {
((Player) sender).openInventory(npc.getTrait(Inventory.class).getInventoryView());
npc.getTrait(Inventory.class).openInventory((Player) sender);
}
@Command(
@ -881,6 +881,9 @@ public class NPCCommands {
if (mount == null || !mount.isSpawned()) {
throw new CommandException(Messaging.tr(Messages.MOUNT_NPC_MUST_BE_SPAWNED, args.getFlag("onnpc")));
}
if (mount.equals(npc)) {
throw new CommandException();
}
NMS.mount(mount.getEntity(), npc.getEntity());
return;
}

167
src/main/java/net/citizensnpcs/npc/entity/HorseController.java
View File

@ -5,6 +5,7 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftHorse;
import org.bukkit.craftbukkit.v1_9_R1.event.CraftEventFactory;
import org.bukkit.entity.Horse;
import org.bukkit.util.Vector;
@ -18,11 +19,16 @@ import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.BlockPosition;
import net.minecraft.server.v1_9_R1.DamageSource;
import net.minecraft.server.v1_9_R1.EnchantmentManager;
import net.minecraft.server.v1_9_R1.EntityHorse;
import net.minecraft.server.v1_9_R1.IBlockData;
import net.minecraft.server.v1_9_R1.MathHelper;
import net.minecraft.server.v1_9_R1.MinecraftKey;
import net.minecraft.server.v1_9_R1.MobEffects;
import net.minecraft.server.v1_9_R1.NBTTagCompound;
import net.minecraft.server.v1_9_R1.SoundEffect;
import net.minecraft.server.v1_9_R1.Vec3D;
import net.minecraft.server.v1_9_R1.World;
public class HorseController extends MobEntityController {
@ -57,6 +63,162 @@ public class HorseController extends MobEntityController {
}
}
public void _g(float f, float f1) {
if ((co()) || (bx())) {
if ((isInWater())) {
double d1 = this.locY;
float f4 = 0.8F;
float f3 = 0.02F;
float f2 = EnchantmentManager.d(this);
if (f2 > 3.0F) {
f2 = 3.0F;
}
if (!this.onGround) {
f2 *= 0.5F;
}
if (f2 > 0.0F) {
f4 += (0.54600006F - f4) * f2 / 3.0F;
f3 += (ck() - f3) * f2 / 3.0F;
}
a(f, f1, f3);
move(this.motX, this.motY, this.motZ);
this.motX *= f4;
this.motY *= 0.800000011920929D;
this.motZ *= f4;
this.motY -= 0.02D;
if ((this.positionChanged)
&& (c(this.motX, this.motY + 0.6000000238418579D - this.locY + d1, this.motZ))) {
this.motY = 0.30000001192092896D;
}
} else if ((an())) {
double d1 = this.locY;
a(f, f1, 0.02F);
move(this.motX, this.motY, this.motZ);
this.motX *= 0.5D;
this.motY *= 0.5D;
this.motZ *= 0.5D;
this.motY -= 0.02D;
if ((this.positionChanged)
&& (c(this.motX, this.motY + 0.6000000238418579D - this.locY + d1, this.motZ))) {
this.motY = 0.30000001192092896D;
}
} else if (cB()) {
if (this.motY > -0.5D) {
this.fallDistance = 1.0F;
}
Vec3D vec3d = aB();
float f5 = this.pitch * 0.017453292F;
double d0 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z);
double d2 = Math.sqrt(this.motX * this.motX + this.motZ * this.motZ);
double d3 = vec3d.b();
float f6 = MathHelper.cos(f5);
f6 = (float) (f6 * f6 * Math.min(1.0D, d3 / 0.4D));
this.motY += -0.08D + f6 * 0.06D;
if ((this.motY < 0.0D) && (d0 > 0.0D)) {
double d4 = this.motY * -0.1D * f6;
this.motY += d4;
this.motX += vec3d.x * d4 / d0;
this.motZ += vec3d.z * d4 / d0;
}
if (f5 < 0.0F) {
double d4 = d2 * -MathHelper.sin(f5) * 0.04D;
this.motY += d4 * 3.2D;
this.motX -= vec3d.x * d4 / d0;
this.motZ -= vec3d.z * d4 / d0;
}
if (d0 > 0.0D) {
this.motX += (vec3d.x / d0 * d2 - this.motX) * 0.1D;
this.motZ += (vec3d.z / d0 * d2 - this.motZ) * 0.1D;
}
this.motX *= 0.9900000095367432D;
this.motY *= 0.9800000190734863D;
this.motZ *= 0.9900000095367432D;
move(this.motX, this.motY, this.motZ);
if ((this.positionChanged) && (!this.world.isClientSide)) {
double d4 = Math.sqrt(this.motX * this.motX + this.motZ * this.motZ);
double d5 = d2 - d4;
float f7 = (float) (d5 * 10.0D - 3.0D);
if (f7 > 0.0F) {
a(e((int) f7), 1.0F, 1.0F);
damageEntity(DamageSource.j, f7);
}
}
if ((this.onGround) && (!this.world.isClientSide) && (getFlag(7))
&& (!CraftEventFactory.callToggleGlideEvent(this, false).isCancelled())) {
setFlag(7, false);
}
} else {
float f8 = 0.91F;
BlockPosition.PooledBlockPosition blockposition_pooledblockposition = BlockPosition.PooledBlockPosition
.c(this.locX, getBoundingBox().b - 1.0D, this.locZ);
if (this.onGround) {
f8 = this.world.getType(blockposition_pooledblockposition).getBlock().frictionFactor * 0.91F;
}
float f4 = 0.16277136F / (f8 * f8 * f8);
float f3;
if (this.onGround) {
f3 = ck() * f4;
} else {
f3 = this.aQ;
}
a(f, f1, f3);
f8 = 0.91F;
if (this.onGround) {
f8 = this.world.getType(
blockposition_pooledblockposition.d(this.locX, getBoundingBox().b - 1.0D, this.locZ))
.getBlock().frictionFactor * 0.91F;
}
if (n_()) {
float f2 = 0.15F;
this.motX = MathHelper.a(this.motX, -f2, f2);
this.motZ = MathHelper.a(this.motZ, -f2, f2);
this.fallDistance = 0.0F;
if (this.motY < -0.15D) {
this.motY = -0.15D;
}
boolean flag = (isSneaking());
if ((flag) && (this.motY < 0.0D)) {
this.motY = 0.0D;
}
}
move(this.motX, this.motY, this.motZ);
if ((this.positionChanged) && (n_())) {
this.motY = 0.2D;
}
if (hasEffect(MobEffects.LEVITATION)) {
this.motY += (0.05D * (getEffect(MobEffects.LEVITATION).getAmplifier() + 1) - this.motY) * 0.2D;
} else {
blockposition_pooledblockposition.d(this.locX, 0.0D, this.locZ);
if ((this.world.isClientSide) && ((!this.world.isLoaded(blockposition_pooledblockposition))
|| (!this.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p()))) {
if (this.locY > 0.0D) {
this.motY = -0.1D;
} else {
this.motY = 0.0D;
}
} else {
this.motY -= 0.08D;
}
}
this.motY *= 0.9800000190734863D;
this.motX *= f8;
this.motZ *= f8;
blockposition_pooledblockposition.t();
}
}
this.aE = this.aF;
double d1 = this.locX - this.lastX;
double d0 = this.locZ - this.lastZ;
float f2 = MathHelper.sqrt(d1 * d1 + d0 * d0) * 4.0F;
if (f2 > 1.0F) {
f2 = 1.0F;
}
this.aF += (f2 - this.aF) * 0.4F;
this.aG += this.aF;
}
@Override
public void a(boolean flag) {
float oldw = width;
@ -154,8 +316,11 @@ public class HorseController extends MobEntityController {
@Override
public void g(float f, float f1) {
if (npc == null || !npc.isFlyable()) {
if (npc == null) {
super.g(f, f1);
return;
} else if (!npc.isFlyable()) {
_g(f, f1);
} else {
NMS.flyingMoveLogic(this, f, f1);
}

167
src/main/java/net/citizensnpcs/npc/entity/PigController.java
View File

@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPig;
import org.bukkit.craftbukkit.v1_9_R1.event.CraftEventFactory;
import org.bukkit.entity.Pig;
import org.bukkit.util.Vector;
@ -16,12 +17,17 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.BlockPosition;
import net.minecraft.server.v1_9_R1.DamageSource;
import net.minecraft.server.v1_9_R1.EnchantmentManager;
import net.minecraft.server.v1_9_R1.EntityLightning;
import net.minecraft.server.v1_9_R1.EntityPig;
import net.minecraft.server.v1_9_R1.IBlockData;
import net.minecraft.server.v1_9_R1.MathHelper;
import net.minecraft.server.v1_9_R1.MinecraftKey;
import net.minecraft.server.v1_9_R1.MobEffects;
import net.minecraft.server.v1_9_R1.NBTTagCompound;
import net.minecraft.server.v1_9_R1.SoundEffect;
import net.minecraft.server.v1_9_R1.Vec3D;
import net.minecraft.server.v1_9_R1.World;
public class PigController extends MobEntityController {
@ -49,6 +55,162 @@ public class PigController extends MobEntityController {
}
}
public void _g(float f, float f1) {
if ((co()) || (bx())) {
if ((isInWater())) {
double d1 = this.locY;
float f4 = 0.8F;
float f3 = 0.02F;
float f2 = EnchantmentManager.d(this);
if (f2 > 3.0F) {
f2 = 3.0F;
}
if (!this.onGround) {
f2 *= 0.5F;
}
if (f2 > 0.0F) {
f4 += (0.54600006F - f4) * f2 / 3.0F;
f3 += (ck() - f3) * f2 / 3.0F;
}
a(f, f1, f3);
move(this.motX, this.motY, this.motZ);
this.motX *= f4;
this.motY *= 0.800000011920929D;
this.motZ *= f4;
this.motY -= 0.02D;
if ((this.positionChanged)
&& (c(this.motX, this.motY + 0.6000000238418579D - this.locY + d1, this.motZ))) {
this.motY = 0.30000001192092896D;
}
} else if ((an())) {
double d1 = this.locY;
a(f, f1, 0.02F);
move(this.motX, this.motY, this.motZ);
this.motX *= 0.5D;
this.motY *= 0.5D;
this.motZ *= 0.5D;
this.motY -= 0.02D;
if ((this.positionChanged)
&& (c(this.motX, this.motY + 0.6000000238418579D - this.locY + d1, this.motZ))) {
this.motY = 0.30000001192092896D;
}
} else if (cB()) {
if (this.motY > -0.5D) {
this.fallDistance = 1.0F;
}
Vec3D vec3d = aB();
float f5 = this.pitch * 0.017453292F;
double d0 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z);
double d2 = Math.sqrt(this.motX * this.motX + this.motZ * this.motZ);
double d3 = vec3d.b();
float f6 = MathHelper.cos(f5);
f6 = (float) (f6 * f6 * Math.min(1.0D, d3 / 0.4D));
this.motY += -0.08D + f6 * 0.06D;
if ((this.motY < 0.0D) && (d0 > 0.0D)) {
double d4 = this.motY * -0.1D * f6;
this.motY += d4;
this.motX += vec3d.x * d4 / d0;
this.motZ += vec3d.z * d4 / d0;
}
if (f5 < 0.0F) {
double d4 = d2 * -MathHelper.sin(f5) * 0.04D;
this.motY += d4 * 3.2D;
this.motX -= vec3d.x * d4 / d0;
this.motZ -= vec3d.z * d4 / d0;
}
if (d0 > 0.0D) {
this.motX += (vec3d.x / d0 * d2 - this.motX) * 0.1D;
this.motZ += (vec3d.z / d0 * d2 - this.motZ) * 0.1D;
}
this.motX *= 0.9900000095367432D;
this.motY *= 0.9800000190734863D;
this.motZ *= 0.9900000095367432D;
move(this.motX, this.motY, this.motZ);
if ((this.positionChanged) && (!this.world.isClientSide)) {
double d4 = Math.sqrt(this.motX * this.motX + this.motZ * this.motZ);
double d5 = d2 - d4;
float f7 = (float) (d5 * 10.0D - 3.0D);
if (f7 > 0.0F) {
a(e((int) f7), 1.0F, 1.0F);
damageEntity(DamageSource.j, f7);
}
}
if ((this.onGround) && (!this.world.isClientSide) && (getFlag(7))
&& (!CraftEventFactory.callToggleGlideEvent(this, false).isCancelled())) {
setFlag(7, false);
}
} else {
float f8 = 0.91F;
BlockPosition.PooledBlockPosition blockposition_pooledblockposition = BlockPosition.PooledBlockPosition
.c(this.locX, getBoundingBox().b - 1.0D, this.locZ);
if (this.onGround) {
f8 = this.world.getType(blockposition_pooledblockposition).getBlock().frictionFactor * 0.91F;
}
float f4 = 0.16277136F / (f8 * f8 * f8);
float f3;
if (this.onGround) {
f3 = ck() * f4;
} else {
f3 = this.aQ;
}
a(f, f1, f3);
f8 = 0.91F;
if (this.onGround) {
f8 = this.world.getType(
blockposition_pooledblockposition.d(this.locX, getBoundingBox().b - 1.0D, this.locZ))
.getBlock().frictionFactor * 0.91F;
}
if (n_()) {
float f2 = 0.15F;
this.motX = MathHelper.a(this.motX, -f2, f2);
this.motZ = MathHelper.a(this.motZ, -f2, f2);
this.fallDistance = 0.0F;
if (this.motY < -0.15D) {
this.motY = -0.15D;
}
boolean flag = (isSneaking());
if ((flag) && (this.motY < 0.0D)) {
this.motY = 0.0D;
}
}
move(this.motX, this.motY, this.motZ);
if ((this.positionChanged) && (n_())) {
this.motY = 0.2D;
}
if (hasEffect(MobEffects.LEVITATION)) {
this.motY += (0.05D * (getEffect(MobEffects.LEVITATION).getAmplifier() + 1) - this.motY) * 0.2D;
} else {
blockposition_pooledblockposition.d(this.locX, 0.0D, this.locZ);
if ((this.world.isClientSide) && ((!this.world.isLoaded(blockposition_pooledblockposition))
|| (!this.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p()))) {
if (this.locY > 0.0D) {
this.motY = -0.1D;
} else {
this.motY = 0.0D;
}
} else {
this.motY -= 0.08D;
}
}
this.motY *= 0.9800000190734863D;
this.motX *= f8;
this.motZ *= f8;
blockposition_pooledblockposition.t();
}
}
this.aE = this.aF;
double d1 = this.locX - this.lastX;
double d0 = this.locZ - this.lastZ;
float f2 = MathHelper.sqrt(d1 * d1 + d0 * d0) * 4.0F;
if (f2 > 1.0F) {
f2 = 1.0F;
}
this.aF += (f2 - this.aF) * 0.4F;
this.aG += this.aF;
}
@Override
public void a(boolean flag) {
float oldw = width;
@ -138,8 +300,10 @@ public class PigController extends MobEntityController {
@Override
public void g(float f, float f1) {
if (npc == null || !npc.isFlyable()) {
if (npc == null) {
super.g(f, f1);
} else if (!npc.isFlyable()) {
_g(f, f1);
} else {
NMS.flyingMoveLogic(this, f, f1);
}
@ -176,7 +340,6 @@ public class PigController extends MobEntityController {
}
return false; // shouldLeash
}
@Override
protected void L() {

3
src/main/java/net/citizensnpcs/trait/Controllable.java
View File

@ -91,8 +91,9 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
@Override
public void load(DataKey key) throws NPCLoadException {
if (key.keyExists("explicittype"))
if (key.keyExists("explicittype")) {
explicitType = Util.matchEntityType(key.getString("explicittype"));
}
}
private void loadController() {