Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-12 18:31:40 +01:00
Code Issues Projects Releases Wiki Activity

Peaceful monsters will now brutalise players

Browse Source
This commit is contained in:
fullwall 2012-10-15 10:02:59 +08:00
parent 63bf0b2221
commit 0c81d3dbf5
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -8,9 +8,12 @@ import java.util.WeakHashMap;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.minecraft.server.ControllerLook; import net.minecraft.server.ControllerLook;
import net.minecraft.server.DamageSource;
import net.minecraft.server.Entity; import net.minecraft.server.Entity;
import net.minecraft.server.EntityLiving; import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntityMonster;
import net.minecraft.server.EntityTypes; import net.minecraft.server.EntityTypes;
import net.minecraft.server.MobEffectList;
import net.minecraft.server.Navigation; import net.minecraft.server.Navigation;
import net.minecraft.server.NetworkManager; import net.minecraft.server.NetworkManager;
import net.minecraft.server.PathfinderGoalSelector; import net.minecraft.server.PathfinderGoalSelector;
@ -42,9 +45,31 @@ public class NMS {
private static Field PATHFINDING_RANGE; private static Field PATHFINDING_RANGE;
private static Field SPEED_FIELD; private static Field SPEED_FIELD;
private static Field THREAD_STOPPER; private static Field THREAD_STOPPER;
private static Field DAMAGE_FIELD;
public static void attack(EntityLiving handle, EntityLiving target) { public static void attack(EntityLiving handle, EntityLiving target) {
handle.k(target); handle.k(target);
int damage = getDamage(handle);
if (handle.hasEffect(MobEffectList.INCREASE_DAMAGE)) {
damage += 3 << handle.getEffect(MobEffectList.INCREASE_DAMAGE).getAmplifier();
}
if (handle.hasEffect(MobEffectList.WEAKNESS)) {
damage -= 2 << handle.getEffect(MobEffectList.WEAKNESS).getAmplifier();
}
target.damageEntity(DamageSource.mobAttack(handle), damage);
}
private static int getDamage(EntityLiving handle) {
if (DAMAGE_FIELD == null)
return 2;
try {
return DAMAGE_FIELD.getInt(handle);
} catch (Exception e) {
}
return 2;
} }
public static void clearGoals(PathfinderGoalSelector... goalSelectors) { public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
@ -220,6 +245,7 @@ public class NMS {
NAVIGATION_WORLD_FIELD = getField(Navigation.class, "b"); NAVIGATION_WORLD_FIELD = getField(Navigation.class, "b");
PATHFINDING_RANGE = getField(Navigation.class, "e"); PATHFINDING_RANGE = getField(Navigation.class, "e");
GOAL_FIELD = getField(PathfinderGoalSelector.class, "a"); GOAL_FIELD = getField(PathfinderGoalSelector.class, "a");
DAMAGE_FIELD = getField(EntityMonster.class, "damage");
try { try {
Field field = getField(EntityTypes.class, "d"); Field field = getField(EntityTypes.class, "d");