Fork/herobrine-2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continued updating codebase

Browse Source
This commit is contained in:
David Berdik 2019-09-02 17:08:56 -04:00
parent 91951ae20f
commit 8a8bc9b65d
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/jakub1221/herobrineai/AI/AICore.java
View File

@ -1,7 +1,6 @@
package org.jakub1221.herobrineai.AI;
import java.util.ArrayList;
import java.util.Random;
import org.bukkit.Bukkit;
import org.bukkit.Effect;

1
src/org/jakub1221/herobrineai/AI/cores/RandomPosition.java
View File

@ -1,7 +1,6 @@
package org.jakub1221.herobrineai.AI.cores;
import java.util.Collection;
import java.util.Random;
import org.bukkit.Bukkit;
import org.bukkit.Location;

3
src/org/jakub1221/herobrineai/HerobrineAI.java
View File

@ -1,17 +1,14 @@
package org.jakub1221.herobrineai;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Color;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;

17
src/org/jakub1221/herobrineai/NPC/Entity/HumanNPC.java
View File

@ -1,9 +1,10 @@
package org.jakub1221.herobrineai.NPC.Entity;
import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.EnumHand;
import net.minecraft.server.v1_14_R1.PacketPlayInArmAnimation;
import net.minecraft.server.v1_14_R1.PlayerChunkMap;
import net.minecraft.server.v1_14_R1.WorldServer;
import net.minecraft.server.v1_14_R1.Entity;
import org.bukkit.Location;
import org.bukkit.entity.LivingEntity;
@ -29,7 +30,12 @@ public class HumanNPC {
}
public void ArmSwingAnimation() {
((WorldServer) entity.world).tracker.a(entity, new PacketPlayInArmAnimation());
PlayerChunkMap playerChunkMap = ((WorldServer) this.entity.world).getChunkProvider().playerChunkMap;
PlayerChunkMap.EntityTracker playerchunkmap_entitytracker = playerChunkMap.trackedEntities.get(this.entity.getId());
if(playerchunkmap_entitytracker != null) {
playerchunkmap_entitytracker.broadcast(new PacketPlayInArmAnimation(EnumHand.MAIN_HAND));
}
}
public void HurtAnimation() {
@ -43,7 +49,7 @@ public class HumanNPC {
public void setItemInHand(ItemStack item) {
if (item != null) {
((org.bukkit.entity.HumanEntity) getEntity().getBukkitEntity()).setItemInHand(item);
((org.bukkit.entity.HumanEntity) getEntity().getBukkitEntity()).getInventory().setItemInMainHand(item);
}
}
@ -69,7 +75,7 @@ public class HumanNPC {
public void removeFromWorld() {
try {
entity.world.removeEntity(entity);
entity.getWorldServer().removeEntity(entity);
} catch (Exception e) {
e.printStackTrace();
}
@ -77,7 +83,6 @@ public class HumanNPC {
public void setYaw(float yaw) {
((EntityPlayer) getEntity()).yaw = yaw;
((EntityPlayer) getEntity()).aA = yaw;
}
public void lookAtPoint(Location point) {
@ -110,7 +115,7 @@ public class HumanNPC {
}
public void setYawA(float yaw) {
((EntityPlayer) getEntity()).aP = yaw;
((EntityPlayer) getEntity()).yaw = yaw;
}
public org.bukkit.entity.Entity getBukkitEntity() {

8
src/org/jakub1221/herobrineai/listeners/EntityListener.java
View File

@ -165,17 +165,17 @@ public class EntityListener implements Listener {
&& PluginCore.getAICore().getCoreTypeNow() != CoreType.GRAVEYARD) {
if (dEvent.getDamager() instanceof Player) {
if (event.getDamage() >= PluginCore.HerobrineHP) {
if (event.getDamage() >= HerobrineAI.HerobrineHP) {
HerobrineDropItems();
PluginCore.getAICore().CancelTarget(CoreType.ANY);
PluginCore.HerobrineHP = PluginCore.HerobrineMaxHP;
HerobrineAI.HerobrineHP = HerobrineAI.HerobrineMaxHP;
Player player = (Player) dEvent.getDamager();
player.sendMessage("<Herobrine> " + PluginCore.getConfigDB().DeathMessage);
} else {
PluginCore.HerobrineHP -= event.getDamage();
HerobrineAI.HerobrineHP -= event.getDamage();
PluginCore.HerobrineNPC.HurtAnimation();
AICore.log.info("HIT: " + event.getDamage());
}
@ -188,7 +188,7 @@ public class EntityListener implements Listener {
PluginCore.getAICore().setAttackTarget((Player) arrow.getShooter());
} else {
if (event.getDamage() >= PluginCore.HerobrineHP) {
if (event.getDamage() >= HerobrineAI.HerobrineHP) {
HerobrineDropItems();