+>Decreased the chance Infinity gets knocked off of Bows. +>Added buff display indicators and improved handling of custom buffs/debuffs. +>Protection enchantment on shields now works properly when calculating Damage Reduction. >Increased Earth Wave artifact ability's level cap from 100 to 10000. >Fixed a bug causing dodge chance to be incorrectly calculated. >Fixed a duping bug with Vacuum Cubes. >Improved efficiency of Filter Cube code so it causes less lag when processing. >Fixed a bug with duplicating ender cubes not working. >Fixed a bug with Tumble cooldown being incorrect visually when the player also had Cooldown Reduction. >Re-did handling of Death Mark stack application. Now works on all enemies.testdev
parent
44c1d79072
commit
ec0fb8e22b
Binary file not shown.
@ -1,10 +1,186 @@ |
||||
package sig.plugin.TwosideKeeper; |
||||
|
||||
import java.util.HashMap; |
||||
import java.util.List; |
||||
|
||||
import org.bukkit.ChatColor; |
||||
import org.bukkit.Color; |
||||
import org.bukkit.entity.LivingEntity; |
||||
import org.bukkit.entity.Player; |
||||
|
||||
import sig.plugin.TwosideKeeper.HelperStructures.Utils.TextUtils; |
||||
|
||||
public class Buff { |
||||
String displayName; |
||||
long expireTime; |
||||
int level; |
||||
Color col; |
||||
private String displayName; |
||||
private long expireTime; |
||||
private int level; |
||||
private Color col; |
||||
private String icon; |
||||
|
||||
public Buff(String displayName, long duration, int amplifier, Color buffcolor, String icon) { |
||||
this.displayName=displayName; |
||||
this.expireTime=TwosideKeeper.getServerTickTime()+duration; |
||||
this.level=amplifier; |
||||
this.col=buffcolor; |
||||
this.icon=icon; |
||||
} |
||||
|
||||
public static boolean hasBuffInHashMap(LivingEntity l, String name) { |
||||
if (l instanceof Player) { |
||||
Player p = (Player)l; |
||||
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); |
||||
return pd.buffs.containsKey(name); |
||||
} else { |
||||
LivingEntityStructure les = LivingEntityStructure.GetLivingEntityStructure(l); |
||||
return les.buffs.containsKey(name); |
||||
} |
||||
} |
||||
|
||||
public static boolean hasBuff(LivingEntity l, String name) { |
||||
if (l instanceof Player) { |
||||
Player p = (Player)l; |
||||
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); |
||||
if (pd.buffs.containsKey(name)) { |
||||
Buff b = pd.buffs.get(name); |
||||
return hasBuffExpired(b); |
||||
} else { |
||||
return false; |
||||
} |
||||
} else { |
||||
LivingEntityStructure les = LivingEntityStructure.GetLivingEntityStructure(l); |
||||
if (les.buffs.containsKey(name)) { |
||||
Buff b = les.buffs.get(name); |
||||
return hasBuffExpired(b); |
||||
} else { |
||||
return false; |
||||
} |
||||
} |
||||
} |
||||
|
||||
public static void outputBuffs(LivingEntity l) { |
||||
if (l instanceof Player) { |
||||
Player p = (Player)l; |
||||
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); |
||||
TwosideKeeper.log(TextUtils.outputHashmap(pd.buffs),0); |
||||
} else { |
||||
LivingEntityStructure les = LivingEntityStructure.GetLivingEntityStructure(l); |
||||
TwosideKeeper.log(TextUtils.outputHashmap(les.buffs),0); |
||||
} |
||||
} |
||||
|
||||
public static HashMap<String,Buff>getBuffData(LivingEntity l) { |
||||
if (l instanceof Player) { |
||||
PlayerStructure pd = PlayerStructure.GetPlayerStructure((Player)l); |
||||
return pd.buffs; |
||||
} else { |
||||
LivingEntityStructure les = LivingEntityStructure.GetLivingEntityStructure(l); |
||||
return les.buffs; |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* Returns <b>null</b> if no buff found! Use <b>hasBuff()</b> to verify they have |
||||
* a buff beforehand. |
||||
*/ |
||||
public static Buff getBuff(LivingEntity l, String name) { |
||||
if (hasBuff(l,name)) { |
||||
if (l instanceof Player) { |
||||
Player p = (Player)l; |
||||
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); |
||||
if (pd.buffs.containsKey(name)) { |
||||
return pd.buffs.get(name); |
||||
} else { |
||||
return null; |
||||
} |
||||
} else { |
||||
LivingEntityStructure les = LivingEntityStructure.GetLivingEntityStructure(l); |
||||
if (les.buffs.containsKey(name)) { |
||||
Buff b = les.buffs.get(name); |
||||
return b; |
||||
} else { |
||||
return null; |
||||
} |
||||
} |
||||
} else { |
||||
return null; |
||||
} |
||||
} |
||||
public static void addBuff(LivingEntity l, String name, Buff buff) { |
||||
if (l instanceof Player) { |
||||
Player p = (Player)l; |
||||
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); |
||||
pd.buffs.put(name, buff); |
||||
} else { |
||||
LivingEntityStructure les = LivingEntityStructure.GetLivingEntityStructure(l); |
||||
les.buffs.put(name, buff); |
||||
} |
||||
} |
||||
public static void removeBuff(LivingEntity l, String name) { |
||||
if (l instanceof Player) { |
||||
Player p = (Player)l; |
||||
PlayerStructure pd = PlayerStructure.GetPlayerStructure(p); |
||||
pd.buffs.remove(name); |
||||
} else { |
||||
LivingEntityStructure les = LivingEntityStructure.GetLivingEntityStructure(l); |
||||
les.buffs.remove(name); |
||||
} |
||||
} |
||||
|
||||
public void increaseStacks(int amt) { |
||||
level+=amt; |
||||
} |
||||
public void decreaseStacks(int amt) { |
||||
level-=amt; |
||||
} |
||||
public void setStacks(int amt) { |
||||
level=amt; |
||||
} |
||||
public void increaseDuration(int duration) { |
||||
expireTime+=duration; |
||||
} |
||||
public void decreaseDuration(int duration) { |
||||
expireTime-=duration; |
||||
} |
||||
public void setDuration(int duration) { |
||||
refreshDuration(duration); |
||||
} |
||||
public void refreshDuration(int duration) { |
||||
expireTime=TwosideKeeper.getServerTickTime()+duration; |
||||
} |
||||
|
||||
private static boolean hasBuffExpired(Buff b) { |
||||
if (b.expireTime<TwosideKeeper.getServerTickTime()) { |
||||
return false; |
||||
} else { |
||||
return true; |
||||
} |
||||
} |
||||
|
||||
public String getDisplayName() { |
||||
return displayName; |
||||
} |
||||
|
||||
public long getExpireTime() { |
||||
return expireTime; |
||||
} |
||||
|
||||
public int getAmplifier() { |
||||
return level; |
||||
} |
||||
|
||||
public Color getBuffParticleColor() { |
||||
return col; |
||||
} |
||||
|
||||
public long getRemainingBuffTime() { |
||||
return Math.max(expireTime-TwosideKeeper.getServerTickTime(),0); |
||||
} |
||||
|
||||
public String toString() { |
||||
return "Buff(Name="+displayName+",Time="+expireTime+",Level="+level+",Color="+col+",Icon="+getBuffIcon()+")"; |
||||
} |
||||
|
||||
public String getBuffIcon() { |
||||
return icon; |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,15 @@ |
||||
package sig.plugin.TwosideKeeper.HelperStructures.Utils; |
||||
|
||||
import sig.plugin.TwosideKeeper.TwosideKeeper; |
||||
|
||||
public class DebugUtils { |
||||
|
||||
public static void showStackTrace() { |
||||
StackTraceElement[] stacktrace = new Throwable().getStackTrace(); |
||||
StringBuilder stack = new StringBuilder("Mini stack tracer:"); |
||||
for (int i=0;i<Math.min(10, stacktrace.length);i++) { |
||||
stack.append("\n"+stacktrace[i].getClassName()+": **"+stacktrace[i].getFileName()+"** "+stacktrace[i].getMethodName()+"():"+stacktrace[i].getLineNumber()); |
||||
} |
||||
TwosideKeeper.log("Trace:"+stack, 0); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue