Skip to content

Commit

Permalink
2.11.0
Browse files Browse the repository at this point in the history
* Updated ProjectKorra dependency to 1.10.2
* Converted to PK's TempFallingBlock class
* Removed CooldownEnforcer, rendered unnecessary by recent PK changes
* Updated FrostBreath to use temperature and humidity in order to work in custom biomes
* Fixed error relating to switching worlds while damaging an entity
  • Loading branch information
Aztlon committed Oct 19, 2022
1 parent 641bf70 commit 8132d9e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>

</repositories>

<dependencies>
Expand All @@ -33,6 +32,7 @@
<groupId>com.github.ProjectKorra</groupId>
<artifactId>ProjectKorra</artifactId>
<version>v1.10.2</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions src/com/jedk1/jedcore/JCManager.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.jedk1.jedcore;
package com.jedk1.jedcore;

import org.bukkit.Bukkit;
import org.bukkit.Bukkit;

import com.jedk1.jedcore.ability.firebending.LightningBurst;
import com.jedk1.jedcore.ability.waterbending.HealingWaters;
import com.jedk1.jedcore.ability.waterbending.IcePassive;
import com.jedk1.jedcore.util.RegenTempBlock;

public class JCManager implements Runnable {
public class JCManager implements Runnable {

public JedCore plugin;

Expand Down
1 change: 0 additions & 1 deletion src/com/jedk1/jedcore/JCMethods.java
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ public static void reload() {
BendingBoard.updateOnline();
JedCore.plugin.initializeCollisions();
FireTick.loadMethod();
CooldownEnforcer.onConfigReload();

BendingBoard.loadOtherCooldowns();
}
Expand Down
1 change: 0 additions & 1 deletion src/com/jedk1/jedcore/JedCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public void onEnable() {
getServer().getPluginManager().registerEvents(new CommandListener(this), this);
getServer().getPluginManager().registerEvents(new JCListener(this), this);
getServer().getPluginManager().registerEvents(new ChiRestrictor(), this);
getServer().getPluginManager().registerEvents(new CooldownEnforcer(), this);
getServer().getScheduler().scheduleSyncRepeatingTask(this, new JCManager(this), 0, 1);

BendingBoard.updateOnline();
Expand Down
2 changes: 1 addition & 1 deletion src/com/jedk1/jedcore/listener/JCListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void onEntityDamage(EntityDamageEvent event) {
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
if (event.getDamager() instanceof Player && event.getEntity() instanceof LivingEntity) {
if (event.getCause() == DamageCause.ENTITY_ATTACK) {
if (event.getCause() == DamageCause.ENTITY_ATTACK && event.getDamager().getWorld().equals(event.getEntity().getWorld())) {
double distSq = event.getDamager().getLocation().distanceSquared(event.getEntity().getLocation());

// Only activate these in melee range
Expand Down
2 changes: 1 addition & 1 deletion src/com/jedk1/jedcore/scoreboard/BendingBoard.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static void updateOnline() {

public static void toggle(Player player) {
if (!enabled) return;
List<String> uuids = new ArrayList<String>();
List<String> uuids = new ArrayList<>();
uuids.addAll(toggled.getConfig().getStringList("Players"));
if (uuids.contains(player.getUniqueId().toString())) {
uuids.remove(player.getUniqueId().toString());
Expand Down

0 comments on commit 8132d9e

Please sign in to comment.