Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-27 05:05:20 +01:00
Code Issues Projects Releases Wiki Activity

Update to 1.16.3

Browse Source
This commit is contained in:
fullwall 2020-09-11 09:29:42 +08:00
parent 11b161e216
commit 52f8044cd5
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.16.2-R0.1-SNAPSHOT</craftbukkit.version> <craftbukkit.version>1.16.3-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>${project.version}</citizensapi.version> <citizensapi.version>${project.version}</citizensapi.version>
<powermock.version>1.4.12</powermock.version> <powermock.version>1.4.12</powermock.version>
</properties> </properties>

3
main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java
View File

@ -171,8 +171,7 @@ public class CitizensTraitFactory implements TraitFactory {
public void registerTrait(TraitInfo info) { public void registerTrait(TraitInfo info) {
Preconditions.checkNotNull(info, "info cannot be null"); Preconditions.checkNotNull(info, "info cannot be null");
if (registered.containsKey(info.getTraitName())) { if (registered.containsKey(info.getTraitName())) {
System.out.println(info.getTraitClass()); throw new IllegalArgumentException("Trait name " + info.getTraitName() + " already registered");
throw new IllegalArgumentException("trait name already registered");
} }
registered.put(info.getTraitName(), info); registered.put(info.getTraitName(), info);
if (info.isDefaultTrait()) { if (info.isDefaultTrait()) {

2
main/src/main/resources/messages_en.properties
View File

@ -276,7 +276,7 @@ citizens.commands.waypoints.opendoors.enabled=[[{0}]] will now open doors while
citizens.commands.waypoints.opendoors.disabled=[[{0}]] will no longer doors while pathfinding. citizens.commands.waypoints.opendoors.disabled=[[{0}]] will no longer doors while pathfinding.
citizens.commands.wolf.traits-updated=[[{0}]]''s Traits were updated. Angry:[[{1}]], Sitting:[[{2}]], Tamed:[[{3}]], Collar Color:[[{4}]] citizens.commands.wolf.traits-updated=[[{0}]]''s Traits were updated. Angry:[[{1}]], Sitting:[[{2}]], Tamed:[[{3}]], Collar Color:[[{4}]]
citizens.conversations.selection.invalid-choice=[[{0}]] is not a valid option. citizens.conversations.selection.invalid-choice=[[{0}]] is not a valid option.
citizens.economy.error-loading=Unable to use economy handling. Has Vault been enabled? citizens.economy.error-loading=Vault not found -> no economy handling.
citizens.economy.minimum-cost-required=Need at least [[{0}]]. citizens.economy.minimum-cost-required=Need at least [[{0}]].
citizens.economy.money-withdrawn=Withdrew [[{0}]] for your NPC. citizens.economy.money-withdrawn=Withdrew [[{0}]] for your NPC.
citizens.editors.already-in-editor=You''re already in an editor! citizens.editors.already-in-editor=You''re already in an editor!

2
v1_16_R2/pom.xml
View File

@ -12,7 +12,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.16.2-R0.1-SNAPSHOT</craftbukkit.version> <craftbukkit.version>1.16.3-R0.1-SNAPSHOT</craftbukkit.version>
</properties> </properties>
<repositories> <repositories>

21
v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/util/PlayerNavigation.java
View File

@ -40,7 +40,7 @@ public class PlayerNavigation extends NavigationAbstract {
protected int e; protected int e;
protected int f; protected int f;
private final AttributeModifiable followRange; private final AttributeModifiable followRange;
protected Vec3D g = Vec3D.a; protected Vec3D g = Vec3D.ORIGIN;
protected BaseBlockPosition h = BaseBlockPosition.ZERO; protected BaseBlockPosition h = BaseBlockPosition.ZERO;
protected long i; protected long i;
protected long j; protected long j;
@ -54,10 +54,11 @@ public class PlayerNavigation extends NavigationAbstract {
private int q; private int q;
private float r = 1.0F; private float r = 1.0F;
private final PlayerPathfinder s; private final PlayerPathfinder s;
private boolean t;
public PlayerNavigation(EntityHumanNPC entityinsentient, World world) { public PlayerNavigation(EntityHumanNPC entityinsentient, World world) {
super(getDummyInsentient(entityinsentient, world), world); super(getDummyInsentient(entityinsentient, world), world);
this.g = Vec3D.a; this.g = Vec3D.ORIGIN;
this.l = 0.5F; this.l = 0.5F;
this.r = 1.0F; this.r = 1.0F;
this.a = entityinsentient; this.a = entityinsentient;
@ -232,8 +233,12 @@ public class PlayerNavigation extends NavigationAbstract {
@Override @Override
protected void a(Vec3D var0) { protected void a(Vec3D var0) {
if (this.e - this.f > 100) { if (this.e - this.f > 100) {
if (var0.distanceSquared(this.g) < 2.25D) if (var0.distanceSquared(this.g) < 2.25D) {
this.t = true;
o(); o();
} else {
this.t = false;
}
this.f = this.e; this.f = this.e;
this.g = var0; this.g = var0;
} }
@ -306,7 +311,7 @@ public class PlayerNavigation extends NavigationAbstract {
@Override @Override
protected Vec3D b() { protected Vec3D b() {
return new Vec3D(this.a.locX(), t(), this.a.locZ()); return new Vec3D(this.a.locX(), u(), this.a.locZ());
} }
@Override @Override
@ -399,6 +404,7 @@ public class PlayerNavigation extends NavigationAbstract {
this.h = BaseBlockPosition.ZERO; this.h = BaseBlockPosition.ZERO;
this.i = 0L; this.i = 0L;
this.k = 0.0D; this.k = 0.0D;
this.t = false;
} }
public boolean f() { public boolean f() {
@ -509,7 +515,12 @@ public class PlayerNavigation extends NavigationAbstract {
} }
} }
private int t() { @Override
public boolean t() {
return this.t;
}
private int u() {
if (!this.a.isInWater() || !r()) if (!this.a.isInWater() || !r())
return MathHelper.floor(this.a.locY() + 0.5D); return MathHelper.floor(this.a.locY() + 0.5D);
int var0 = MathHelper.floor(this.a.locY()); int var0 = MathHelper.floor(this.a.locY());