sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Push out recent targeting looking system without Summoner mode release.

Browse Source
This commit is contained in:
sigonasr2 2017-10-01 02:28:21 -05:00
parent bca56c165c
commit e45e1e0af2
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

15
src/sig/plugin/TwosideKeeper/HelperStructures/PlayerMode.java
View File

@ -17,8 +17,8 @@ public enum PlayerMode {
BARBARIAN(ChatColor.GOLD,"B","Barbarian",Book.BARBARIANGUIDE BARBARIAN(ChatColor.GOLD,"B","Barbarian",Book.BARBARIANGUIDE
), ),
SLAYER(ChatColor.DARK_BLUE,"SL","Slayer",Book.SLAYERGUIDE), SLAYER(ChatColor.DARK_BLUE,"SL","Slayer",Book.SLAYERGUIDE),
SUMMONER(ChatColor.DARK_PURPLE,"SM","Summoner", /*SUMMONER(ChatColor.DARK_PURPLE,"SM","Summoner",
Book.SUMMONERGUIDE), Book.SUMMONERGUIDE),*/
NORMAL(ChatColor.WHITE,"A","Adventurer",Book.ADVENTURERGUIDE); NORMAL(ChatColor.WHITE,"A","Adventurer",Book.ADVENTURERGUIDE);
; ;
@ -63,9 +63,9 @@ public enum PlayerMode {
if (Check_isRanger(p)) { if (Check_isRanger(p)) {
pd.lastmode=PlayerMode.RANGER; pd.lastmode=PlayerMode.RANGER;
} else } else
if (Check_isSummoner(p)) { /*if (Check_isSummoner(p)) {
pd.lastmode=PlayerMode.SUMMONER; pd.lastmode=PlayerMode.SUMMONER;
} else { } else*/ {
pd.lastmode=PlayerMode.NORMAL; pd.lastmode=PlayerMode.NORMAL;
} }
} }
@ -149,7 +149,7 @@ public enum PlayerMode {
} }
} }
public static boolean isSummoner(Player p) { /*public static boolean isSummoner(Player p) {
if (p!=null && !p.isDead()) { if (p!=null && !p.isDead()) {
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); PlayerStructure pd = PlayerStructure.GetPlayerStructure(p);
if (needsUpdating(pd)) { if (needsUpdating(pd)) {
@ -160,7 +160,7 @@ public enum PlayerMode {
} else { } else {
return false; return false;
} }
} }*/
public static boolean isNormal(Player p) { public static boolean isNormal(Player p) {
if (p!=null && !p.isDead()) { if (p!=null && !p.isDead()) {
@ -268,6 +268,7 @@ public enum PlayerMode {
} }
} }
/*
public static boolean Check_isSummoner(Player p) { public static boolean Check_isSummoner(Player p) {
if (p!=null && !p.isDead()) { if (p!=null && !p.isDead()) {
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); PlayerStructure pd = PlayerStructure.GetPlayerStructure(p);
@ -284,7 +285,7 @@ public enum PlayerMode {
} else { } else {
return false; return false;
} }
} }*/
String name=""; String name="";
Book helperBook; Book helperBook;

4
src/sig/plugin/TwosideKeeper/runServerTick.java
View File

@ -39,7 +39,7 @@ public class runServerTick implements Runnable{
if (pd.myPet!=null) { if (pd.myPet!=null) {
pd.myPet.run(); pd.myPet.run();
} }
if (PlayerMode.isSummoner(p)) { /*if (PlayerMode.isSummoner(p)) {
//long timer = System.nanoTime(); //long timer = System.nanoTime();
LivingEntity targetent = aPlugin.API.rayTraceTargetEntity(p, 16); LivingEntity targetent = aPlugin.API.rayTraceTargetEntity(p, 16);
if (targetent!=null) { if (targetent!=null) {
@ -59,7 +59,7 @@ public class runServerTick implements Runnable{
pd.lastTarget=targetent; pd.lastTarget=targetent;
} }
//TwosideKeeper.log("Time Execution took: "+((System.nanoTime()-timer)/1000000)+"ms", 1); //TwosideKeeper.log("Time Execution took: "+((System.nanoTime()-timer)/1000000)+"ms", 1);
} }*/
if (pd.mouseoverhealthbar && pd.lastGrabbedTarget+10<=TwosideKeeper.getServerTickTime()) { if (pd.mouseoverhealthbar && pd.lastGrabbedTarget+10<=TwosideKeeper.getServerTickTime()) {
LivingEntity targetent = aPlugin.API.rayTraceTargetEntity(p, 16); LivingEntity targetent = aPlugin.API.rayTraceTargetEntity(p, 16);
if (targetent!=null && (!(targetent instanceof ArmorStand) || (targetent instanceof ArmorStand && ((ArmorStand)targetent).isVisible())) && if (targetent!=null && (!(targetent instanceof ArmorStand) || (targetent instanceof ArmorStand && ((ArmorStand)targetent).isVisible())) &&