Skip to content

Commit 49d404c

Browse files
NikV2NikV2
committed
Commit
1 parent 262a742 commit 49d404c

4 files changed

Lines changed: 17 additions & 30 deletions

File tree

‎src/main/java/me/nik/combatplus/files/Config.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ public static void addDefaults() {
106106
Config.get().addDefault("advanced.settings.old_regen.exhaustion", 3);
107107
Config.get().addDefault("advanced.settings.base_player_health", 20);
108108
Config.get().addDefault("advanced.settings.knockback.fishing_rod.damage", 0.01);
109-
Config.get().addDefault("advanced.settings.knockback.fishing_rod.entity_damage_event", false);
110109
Config.get().addDefault("advanced.settings.kill_aura.entity", "BAT");
111110
Config.get().addDefault("advanced.settings.kill_aura.teleport_ticks", 1);
112111
Config.get().addDefault("advanced.settings.kill_aura.ticks_duration", 300);

‎src/main/java/me/nik/combatplus/listeners/FishingRodKnockback.java‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public class FishingRodKnockback implements Listener {
2424

2525
private final double fishingRodDamage = Config.get().getDouble("advanced.settings.knockback.fishing_rod.damage");
2626
private final boolean cancelDragging = Config.get().getBoolean("knockback.fishing_rod.cancel_dragging");
27-
private final boolean useEntityDamageEvent = Config.get().getBoolean("advanced.settings.knockback.fishing_rod.entity_damage_event");
2827

2928
@EventHandler(priority = EventPriority.HIGHEST)
3029
public void onRodLand(ProjectileHitEvent e) {
@@ -56,12 +55,10 @@ public void onRodLand(ProjectileHitEvent e) {
5655

5756
if (player.getGameMode() == GameMode.CREATIVE) return;
5857
}
59-
6058
LivingEntity livingEntity = (LivingEntity) target;
6159

6260
if (livingEntity.getNoDamageTicks() > livingEntity.getMaximumNoDamageTicks() / 2f) return;
63-
64-
EntityDamageEvent event = makeEvent(rodder, target, fishingRodDamage);
61+
EntityDamageEvent event = customEvent(rodder, target, fishingRodDamage);
6562
Bukkit.getPluginManager().callEvent(event);
6663
if (event.isCancelled()) return;
6764

@@ -80,25 +77,25 @@ public void onHook(PlayerFishEvent e) {
8077
}
8178

8279
private Vector calculateKnockbackVelocity(Vector currentVelocity, Location player, Location hook) {
83-
double xDistance = hook.getX() - player.getX();
84-
double zDistance = hook.getZ() - player.getZ();
80+
double xDist = hook.getX() - player.getX();
81+
double zDist = hook.getZ() - player.getZ();
8582

86-
while (xDistance * xDistance + zDistance * zDistance < 0.0001) {
87-
xDistance = (Math.random() - Math.random()) * 0.01D;
88-
zDistance = (Math.random() - Math.random()) * 0.01D;
83+
while (xDist * xDist + zDist * zDist < 0.0001) {
84+
xDist = (Math.random() - Math.random()) * 0.01D;
85+
zDist = (Math.random() - Math.random()) * 0.01D;
8986
}
9087

91-
double distance = Math.sqrt(xDistance * xDistance + zDistance * zDistance);
88+
double distance = Math.sqrt(xDist * xDist + zDist * zDist);
9289

9390
double y = currentVelocity.getY() / 2;
9491
double x = currentVelocity.getX() / 2;
9592
double z = currentVelocity.getZ() / 2;
9693

97-
x -= xDistance / distance * 0.4;
94+
x -= xDist / distance * 0.4;
9895

9996
y += 0.4;
10097

101-
z -= zDistance / distance * 0.4;
98+
z -= zDist / distance * 0.4;
10299

103100
if (y >= 0.4) {
104101
y = 0.4;
@@ -107,16 +104,7 @@ private Vector calculateKnockbackVelocity(Vector currentVelocity, Location playe
107104
return new Vector(x, y, z);
108105
}
109106

110-
private EntityDamageEvent makeEvent(Player rodder, Entity entity, double damage) {
111-
if (useEntityDamageEvent) {
112-
return new EntityDamageEvent(entity,
113-
EntityDamageEvent.DamageCause.PROJECTILE,
114-
damage);
115-
} else {
116-
return new EntityDamageByEntityEvent(rodder,
117-
entity,
118-
EntityDamageEvent.DamageCause.PROJECTILE,
119-
damage);
120-
}
107+
private EntityDamageEvent customEvent(Player rodder, Entity entity, double damage) {
108+
return new EntityDamageByEntityEvent(rodder, entity, EntityDamageEvent.DamageCause.PROJECTILE, damage);
121109
}
122110
}

‎src/main/java/me/nik/combatplus/listeners/PlayerRegen.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void onRegen(EntityRegainHealthEvent e) {
5252
if (currentTime - lastHealTime < oldRegenFrequency) return;
5353
final double maxHealth = p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
5454
if (playerHealth < maxHealth) {
55-
p.setHealth(clamp(playerHealth + oldRegenAmount, 0.0, maxHealth));
55+
p.setHealth(clamp(playerHealth + oldRegenAmount, maxHealth));
5656
healTimes.put(playerID, currentTime);
5757
}
5858
final float previousExhaustion = p.getExhaustion();
@@ -67,9 +67,9 @@ public void run() {
6767
}.runTaskLater(plugin, 1);
6868
}
6969

70-
private double clamp(double value, double min, double max) {
71-
double realMin = Math.min(min, max);
72-
double realMax = Math.max(min, max);
70+
private double clamp(double value, double max) {
71+
double realMin = Math.min(0.0, max);
72+
double realMax = Math.max(0.0, max);
7373
if (value < realMin) {
7474
value = realMin;
7575
}
@@ -80,7 +80,7 @@ private double clamp(double value, double min, double max) {
8080
}
8181

8282
@EventHandler
83-
public void onPlayerQuit(PlayerQuitEvent e) {
83+
public void cleanHashMap(PlayerQuitEvent e) {
8484
UUID pUuid = e.getPlayer().getUniqueId();
8585
if (!healTimes.containsKey(pUuid)) return;
8686
healTimes.remove(pUuid);

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: CombatPlus
2-
version: 1.3.2
2+
version: 1.3.3
33
main: me.nik.combatplus.CombatPlus
44
api-version: 1.13
55
authors: [Nik]

0 commit comments

Comments
 (0)