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

Bump pom, fix trader llamas

Browse Source
This commit is contained in:
fullwall 2019-05-28 18:03:45 +08:00
parent 220fc1623d
commit 489438b2f1
3 changed files with 12 additions and 3 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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.14.1-R0.1-SNAPSHOT</craftbukkit.version>
<craftbukkit.version>1.14.2-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>${project.version}</citizensapi.version>
<powermock.version>1.4.12</powermock.version>
<bstats.version>1.5</bstats.version>

2
v1_14_R1/pom.xml
View File

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

11
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java
View File

@ -1,5 +1,7 @@
package net.citizensnpcs.nms.v1_14_R1.entity;
import java.lang.invoke.MethodHandle;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
@ -209,11 +211,18 @@ public class TraderLlamaController extends MobEntityController {
if (npc == null) {
super.mobTick();
} else {
v(10);
try {
if (bJ != null) {
bJ.invoke(this, 10); // DespawnDelay
}
} catch (Throwable e) {
}
NMS.setStepHeight(getBukkitEntity(), 1);
npc.update();
}
}
private static final MethodHandle bJ = NMS.getSetter(EntityLlamaTrader.class, "bJ");
}
public static class TraderLlamaNPC extends CraftTraderLlama implements NPCHolder {