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

Try a better way of clearing advancement progress

Browse Source
This commit is contained in:
fullwall 2017-08-22 21:09:06 +08:00
parent 8bd543c035
commit 0a6b954976
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/pom.xml
View File

@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.12-R0.1-SNAPSHOT</craftbukkit.version>
<craftbukkit.version>1.12.1-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0.22-SNAPSHOT</citizensapi.version>
<vault.version>1.5.4</vault.version>
<powermock.version>1.4.12</powermock.version>

2
v1_12_R1/pom.xml
View File

@ -11,7 +11,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.12-R0.1-SNAPSHOT</craftbukkit.version>
<craftbukkit.version>1.12.1-R0.1-SNAPSHOT</craftbukkit.version>
</properties>
<repositories>

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

@ -1,6 +1,7 @@
package net.citizensnpcs.nms.v1_12_R1.entity;
import java.io.IOException;
import java.lang.reflect.Field;
import java.net.Socket;
import java.util.List;
import java.util.Map;
@ -41,6 +42,7 @@ import net.citizensnpcs.npc.skin.SkinnableEntity;
import net.citizensnpcs.trait.Gravity;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_12_R1.AdvancementProgress;
import net.minecraft.server.v1_12_R1.AttributeInstance;
import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.ChatComponentText;
@ -120,6 +122,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
super.B_();
if (npc == null)
return;
if (this.getAdvancementData().data != null) {
for (AdvancementProgress progress : this.getAdvancementData().data.values()) {
clearProgress(progress);
}
}
this.noclip = isSpectator();
if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) {
updateEffects = true;
@ -151,6 +158,14 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
npc.update();
}
private void clearProgress(AdvancementProgress progress) {
try {
PROGRESS_TRACKER_FIELD.set(progress, EMPTY_PROGRESS);
} catch (IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
}
}
@Override
public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
// this method is called by both the entities involved - cancelling
@ -499,6 +514,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
}
}
private static final String[][] EMPTY_PROGRESS = new String[0][0];
private static final float EPSILON = 0.005F;
private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0);
private static final Field PROGRESS_TRACKER_FIELD = NMS.getField(AdvancementProgress.class, "b");
}