JUFS/Tplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from Badbird-5907/master

Browse Source 
fix lava damage
This commit is contained in:
Chris
2021-08-31 11:20:44 -05:00
committed by GitHub
parent e63425ede5 1df3d082b5
commit 77e3ac60ee
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/nuggetmc/tplus/bot/Bot.java
View File

@@ -301,7 +301,7 @@ public class Bot extends EntityPlayer {
if (noDamageTicks == 0) { if (noDamageTicks == 0) {
if (lava) { if (lava) {
damageEntity(DamageSource.LAVA, 4); damageEntity(DamageSource.LAVA, 4);
noDamageTicks = 12; noDamageTicks = 20;//this used to be 12 ticks but that would cause the bot to take damage too quickly
} else if (fireTicks > 1) { } else if (fireTicks > 1) {
damageEntity(DamageSource.FIRE, 1); damageEntity(DamageSource.FIRE, 1);
noDamageTicks = 20; noDamageTicks = 20;
@@ -524,8 +524,11 @@ public class Bot extends EntityPlayer {
private void dieCheck() { private void dieCheck() {
if (removeOnDeath) { if (removeOnDeath) {
//scheduler.runTask(plugin, () -> plugin.getManager().remove(this)); // maybe making this later will fix the concurrentmodificationexception?
plugin.getManager().remove(this); //this should fix the concurrentmodificationexception mentioned above, I used the ConcurrentHashMap.newKeySet to make a "ConcurrentHashSet" // I replaced HashSet with ConcurrentHashMap.newKeySet which creates a "ConcurrentHashSet"
// this should fix the concurrentmodificationexception mentioned above, I used the ConcurrentHashMap.newKeySet to make a "ConcurrentHashSet"
plugin.getManager().remove(this);
scheduler.runTaskLater(plugin, this::setDead, 30); scheduler.runTaskLater(plugin, this::setDead, 30);
this.removeTab(); this.removeTab();

2
src/main/java/net/nuggetmc/tplus/bot/BotManager.java
View File

@@ -31,7 +31,7 @@ public class BotManager implements Listener {
public BotManager() { public BotManager() {
this.agent = new LegacyAgent(this); this.agent = new LegacyAgent(this);
this.bots = ConcurrentHashMap.newKeySet(); this.bots = ConcurrentHashMap.newKeySet(); //should fix concurrentmodificationexception
this.numberFormat = NumberFormat.getInstance(Locale.US); this.numberFormat = NumberFormat.getInstance(Locale.US);
} }