TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-22 16:05:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge https://github.com/ProjectKorra/ProjectKorra

Browse source
This commit is contained in:
Telesphoreo 2021-09-29 17:12:22 -05:00
commit fe5e0fe53e
72 changed files with 1945 additions and 1358 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
localrepo/com/songoda/kingdoms/1.2.3/kingdoms-1.2.3.jar
View file

Binary file not shown.

9
localrepo/com/songoda/kingdoms/1.2.3/kingdoms-1.2.3.pom
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.songoda</groupId>
<artifactId>kingdoms</artifactId>
<version>1.2.3</version>
<description>POM was created from install:install-file</description>
</project>

12
localrepo/com/songoda/kingdoms/maven-metadata-local.xml
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.songoda</groupId>
<artifactId>kingdoms</artifactId>
<versioning>
<release>1.2.3</release>
<versions>
<version>1.2.3</version>
</versions>
<lastUpdated>20190223101813</lastUpdated>
</versioning>
</metadata>

34
pom.xml
View file

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.projectkorra</groupId> <groupId>com.projectkorra</groupId>
<artifactId>projectkorra</artifactId> <artifactId>projectkorra</artifactId>
<version>1.9.0</version> <version>1.9.2</version>
<name>ProjectKorra</name> <name>ProjectKorra</name>
<repositories> <repositories>
<!-- local jar files, add more using: mvn install:install-file -Dfile=aaa.jar -DgroupId=aaa -DartifactId=aaa -Dversion=aaa -Dpackaging=jar -DlocalRepositoryPath=path/to/ProjectKorra/localrepo/ --> <!-- local jar files, add more using: mvn install:install-file -Dfile=aaa.jar -DgroupId=aaa -DartifactId=aaa -Dversion=aaa -Dpackaging=jar -DlocalRepositoryPath=path/to/ProjectKorra/localrepo/ -->
@ -17,7 +17,7 @@
<id>sk89q-repo</id> <id>sk89q-repo</id>
<url>http://maven.sk89q.com/repo/</url> <url>http://maven.sk89q.com/repo/</url>
</repository> </repository>
<!-- GriefPrevention Repo --> <!-- GriefPrevention and Towny Repo -->
<repository> <repository>
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
@ -80,8 +80,8 @@
<artifactId>factionsframework</artifactId> <artifactId>factionsframework</artifactId>
<version>1.2.0</version> <version>1.2.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- GriefPrevention --> <!-- GriefPrevention -->
<dependency> <dependency>
<groupId>com.github.TechFortress</groupId> <groupId>com.github.TechFortress</groupId>
<artifactId>GriefPrevention</artifactId> <artifactId>GriefPrevention</artifactId>
@ -121,9 +121,9 @@
</dependency> </dependency>
<!-- Towny --> <!-- Towny -->
<dependency> <dependency>
<groupId>com.palmergames</groupId> <groupId>com.github.TownyAdvanced</groupId>
<artifactId>Towny</artifactId> <artifactId>Towny</artifactId>
<version>0.93.0.0</version> <version>0.96.2.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- WorldEdit / WorldGuard --> <!-- WorldEdit / WorldGuard -->
@ -160,10 +160,16 @@
</dependency> </dependency>
<!-- Kingdoms --> <!-- Kingdoms -->
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.github.cryptomorin</groupId>
<artifactId>kingdoms</artifactId> <artifactId>kingdoms</artifactId>
<version>1.2.3</version> <version>1.10.19.1</version>
<scope>provided</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- PlaceholderAPI --> <!-- PlaceholderAPI -->
<dependency> <dependency>
@ -208,9 +214,17 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version> <version>3.2.4</version>
<configuration> <configuration>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<filters>
<filter>
<artifact>com.github.cryptomorin:kingdoms</artifact>
<includes>
<include>org/kingdoms/constants/player/KingdomPermission.class</include>
</includes>
</filter>
</filters>
<relocations> <relocations>
<relocation> <relocation>
<pattern>co.aikar.timings.lib</pattern> <pattern>co.aikar.timings.lib</pattern>

31
src/com/projectkorra/projectkorra/BendingPlayer.java
View file

@ -10,6 +10,7 @@ import java.util.Map.Entry;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import com.projectkorra.projectkorra.event.PlayerStanceChangeEvent;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -27,6 +28,7 @@ import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.CoreAbility; import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.util.PassiveManager; import com.projectkorra.projectkorra.ability.util.PassiveManager;
import com.projectkorra.projectkorra.avatar.AvatarState; import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.board.BendingBoardManager;
import com.projectkorra.projectkorra.command.Commands; import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager; import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.metal.MetalClips; import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
@ -132,7 +134,7 @@ public class BendingPlayer {
if (cooldown <= 0) { if (cooldown <= 0) {
return; return;
} }
final PlayerCooldownChangeEvent event = new PlayerCooldownChangeEvent(Bukkit.getPlayer(this.uuid), ability, cooldown, Result.ADDED); final PlayerCooldownChangeEvent event = new PlayerCooldownChangeEvent(player, ability, cooldown, Result.ADDED);
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
@ -147,9 +149,11 @@ public class BendingPlayer {
final String abilityName = event.getAbility(); final String abilityName = event.getAbility();
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
if (bPlayer.getBoundAbility() != null && bPlayer.getBoundAbility().equals(CoreAbility.getAbility(abilityName))) { if (bPlayer != null && bPlayer.getBoundAbility() != null && bPlayer.getBoundAbility().equals(CoreAbility.getAbility(abilityName))) {
GeneralMethods.displayMovePreview(player); GeneralMethods.displayMovePreview(player);
} }
BendingBoardManager.updateBoard(player, event.getAbility(), true, 0);
} }
} }
@ -310,6 +314,8 @@ public class BendingPlayer {
return false; return false;
} else if (!this.player.hasPermission("bending." + element.getName() + ".passive")) { } else if (!this.player.hasPermission("bending." + element.getName() + ".passive")) {
return false; return false;
} else if (!this.player.hasPermission("bending.ability." + ability.getName())) {
return false;
} else if (!this.hasElement(element)) { } else if (!this.hasElement(element)) {
return false; return false;
} else if (disabledWorlds != null && disabledWorlds.contains(this.player.getWorld().getName())) { } else if (disabledWorlds != null && disabledWorlds.contains(this.player.getWorld().getName())) {
@ -803,22 +809,25 @@ public class BendingPlayer {
* @param ability The ability's cooldown to remove * @param ability The ability's cooldown to remove
*/ */
public void removeCooldown(final String ability) { public void removeCooldown(final String ability) {
if (Bukkit.getPlayer(this.uuid) == null) { final PlayerCooldownChangeEvent event = new PlayerCooldownChangeEvent(player, ability, 0, Result.REMOVED);
return;
}
final PlayerCooldownChangeEvent event = new PlayerCooldownChangeEvent(Bukkit.getPlayer(this.uuid), ability, 0, Result.REMOVED);
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
this.cooldowns.remove(ability); this.cooldowns.remove(ability);
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (player == null) {
return;
}
final String abilityName = event.getAbility(); final String abilityName = event.getAbility();
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
if (bPlayer.getBoundAbility() != null && bPlayer.getBoundAbility().equals(CoreAbility.getAbility(abilityName))) { if (bPlayer != null && bPlayer.getBoundAbility() != null && bPlayer.getBoundAbility().equals(CoreAbility.getAbility(abilityName))) {
GeneralMethods.displayMovePreview(player); GeneralMethods.displayMovePreview(player);
} }
BendingBoardManager.updateBoard(player, event.getAbility(), false, 0);
} }
} }
@ -858,11 +867,17 @@ public class BendingPlayer {
/** /**
* Sets the player's {@link ChiAbility Chi stance} * Sets the player's {@link ChiAbility Chi stance}
* Also update any previews
* *
* @param stance The player's new stance object * @param stance The player's new stance object
*/ */
public void setStance(final ChiAbility stance) { public void setStance(final ChiAbility stance) {
final String oldStance = (this.stance == null) ? "" : this.stance.getName();
final String newStance = (stance == null) ? "" : stance.getName();
this.stance = stance; this.stance = stance;
GeneralMethods.displayMovePreview(player);
final PlayerStanceChangeEvent event = new PlayerStanceChangeEvent(Bukkit.getPlayer(this.uuid), oldStance, newStance);
Bukkit.getServer().getPluginManager().callEvent(event);
} }
/** /**

224
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -39,28 +39,13 @@ import com.google.common.reflect.ClassPath;
import com.griefcraft.lwc.LWC; import com.griefcraft.lwc.LWC;
import com.griefcraft.lwc.LWCPlugin; import com.griefcraft.lwc.LWCPlugin;
import com.griefcraft.model.Protection; import com.griefcraft.model.Protection;
import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.object.TownyPermission.ActionType;
import com.palmergames.bukkit.towny.TownyMessaging;
import com.palmergames.bukkit.towny.TownySettings;
import com.palmergames.bukkit.towny.object.Coord;
import com.palmergames.bukkit.towny.object.PlayerCache;
import com.palmergames.bukkit.towny.object.PlayerCache.TownBlockStatus;
import com.palmergames.bukkit.towny.object.TownyPermission;
import com.palmergames.bukkit.towny.object.TownyUniverse;
import com.palmergames.bukkit.towny.object.TownyWorld;
import com.palmergames.bukkit.towny.object.WorldCoord;
import com.palmergames.bukkit.towny.utils.PlayerCacheUtil; import com.palmergames.bukkit.towny.utils.PlayerCacheUtil;
import com.palmergames.bukkit.towny.war.flagwar.TownyWar;
import com.palmergames.bukkit.towny.war.flagwar.TownyWarConfig;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.flags.Flags; import com.sk89q.worldguard.protection.flags.Flags;
import com.sk89q.worldguard.protection.flags.StateFlag; import com.sk89q.worldguard.protection.flags.StateFlag;
import com.songoda.kingdoms.constants.land.Land;
import com.songoda.kingdoms.constants.land.SimpleChunkLocation;
import com.songoda.kingdoms.constants.player.KingdomPlayer;
import com.songoda.kingdoms.manager.game.GameManagement;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -87,6 +72,13 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import org.kingdoms.constants.kingdom.Kingdom;
import org.kingdoms.constants.kingdom.model.KingdomRelation;
import org.kingdoms.constants.land.Land;
import org.kingdoms.constants.land.structures.managers.Regulator;
import org.kingdoms.constants.land.structures.managers.Regulator.Attribute;
import org.kingdoms.constants.player.DefaultKingdomPermission;
import org.kingdoms.constants.player.KingdomPlayer;
import com.projectkorra.projectkorra.Element.SubElement; import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.ability.Ability; import com.projectkorra.projectkorra.ability.Ability;
@ -109,9 +101,11 @@ import com.projectkorra.projectkorra.airbending.AirShield;
import com.projectkorra.projectkorra.airbending.AirSpout; import com.projectkorra.projectkorra.airbending.AirSpout;
import com.projectkorra.projectkorra.airbending.AirSuction; import com.projectkorra.projectkorra.airbending.AirSuction;
import com.projectkorra.projectkorra.airbending.AirSwipe; import com.projectkorra.projectkorra.airbending.AirSwipe;
import com.projectkorra.projectkorra.board.BendingBoardManager;
import com.projectkorra.projectkorra.configuration.ConfigManager; import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.EarthBlast; import com.projectkorra.projectkorra.earthbending.EarthBlast;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive; import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.event.AbilityVelocityAffectEntityEvent;
import com.projectkorra.projectkorra.event.BendingPlayerCreationEvent; import com.projectkorra.projectkorra.event.BendingPlayerCreationEvent;
import com.projectkorra.projectkorra.event.BendingReloadEvent; import com.projectkorra.projectkorra.event.BendingReloadEvent;
import com.projectkorra.projectkorra.event.PlayerBindChangeEvent; import com.projectkorra.projectkorra.event.PlayerBindChangeEvent;
@ -125,8 +119,6 @@ import com.projectkorra.projectkorra.util.BlockCacheElement;
import com.projectkorra.projectkorra.util.ColoredParticle; import com.projectkorra.projectkorra.util.ColoredParticle;
import com.projectkorra.projectkorra.util.MovementHandler; import com.projectkorra.projectkorra.util.MovementHandler;
import com.projectkorra.projectkorra.util.ParticleEffect; import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.ReflectionHandler;
import com.projectkorra.projectkorra.util.ReflectionHandler.PackageType;
import com.projectkorra.projectkorra.util.TempArmor; import com.projectkorra.projectkorra.util.TempArmor;
import com.projectkorra.projectkorra.util.TempArmorStand; import com.projectkorra.projectkorra.util.TempArmorStand;
import com.projectkorra.projectkorra.util.TempBlock; import com.projectkorra.projectkorra.util.TempBlock;
@ -155,25 +147,13 @@ public class GeneralMethods {
private static final ArrayList<Ability> INVINCIBLE = new ArrayList<>(); private static final ArrayList<Ability> INVINCIBLE = new ArrayList<>();
private static ProjectKorra plugin; private static ProjectKorra plugin;
private static Method getAbsorption;
private static Method setAbsorption;
private static Method getHandle;
public GeneralMethods(final ProjectKorra plugin) { public GeneralMethods(final ProjectKorra plugin) {
GeneralMethods.plugin = plugin; GeneralMethods.plugin = plugin;
try {
getAbsorption = ReflectionHandler.getMethod("EntityHuman", PackageType.MINECRAFT_SERVER, "getAbsorptionHearts");
setAbsorption = ReflectionHandler.getMethod("EntityHuman", PackageType.MINECRAFT_SERVER, "setAbsorptionHearts", Float.class);
getHandle = ReflectionHandler.getMethod("CraftPlayer", PackageType.CRAFTBUKKIT_ENTITY, "getHandle");
} catch (final Exception e) {
e.printStackTrace();
}
} }
/** /**
* Checks to see if an AbilityExists. Uses method * Checks to see if an AbilityExists. Uses method
* {@link #getAbility(String)} to check if it exists. * {@link CoreAbility#getAbility(String)} to check if it exists.
* *
* @param string Ability Name * @param string Ability Name
* @return true if ability exists * @return true if ability exists
@ -681,26 +661,25 @@ public class GeneralMethods {
ActionBar.sendActionBar(displayedMessage, player); ActionBar.sendActionBar(displayedMessage, player);
} }
/**
* Gets the number of absorption hearts of a specified {@link Player}.
* @param player the {@link Player} to get the absorption hearts of.
* @deprecated Use {@link Player#getAbsorptionAmount()}.
*/
@Deprecated
public static float getAbsorbationHealth(final Player player) { public static float getAbsorbationHealth(final Player player) {
return (float) player.getAbsorptionAmount();
try {
final Object entityplayer = getHandle.invoke(player);
final Object hearts = getAbsorption.invoke(entityplayer);
return (float) hearts;
} catch (final Exception e) {
e.printStackTrace();
}
return 0;
} }
/**
* Sets the number of absorption hearts of a specified {@link Player}.
* @param player the {@link Player} to set the absorption hearts of.
* @param hearts a float representing the number of hearts to set.
* @deprecated Use {@link Player#setAbsorptionAmount(double)}
*/
@Deprecated
public static void setAbsorbationHealth(final Player player, final float hearts) { public static void setAbsorbationHealth(final Player player, final float hearts) {
player.setAbsorptionAmount(hearts);
try {
final Object entityplayer = getHandle.invoke(player);
setAbsorption.invoke(entityplayer, hearts);
} catch (final Exception e) {
e.printStackTrace();
}
} }
public static int getArmorTier(Material mat) { public static int getArmorTier(Material mat) {
@ -1041,7 +1020,6 @@ public class GeneralMethods {
* @param block The single block * @param block The single block
* @param type The Material type to change the block into * @param type The Material type to change the block into
* @param data The block data to change the block into * @param data The block data to change the block into
* @param breakitem Unused
* @return The item drops fromt the specified block * @return The item drops fromt the specified block
*/ */
public static Collection<ItemStack> getDrops(final Block block, final Material type, final BlockData data) { public static Collection<ItemStack> getDrops(final Block block, final Material type, final BlockData data) {
@ -1297,7 +1275,7 @@ public class GeneralMethods {
if (trans.contains(block.getType())) { if (trans.contains(block.getType())) {
continue; continue;
} else if (ignoreTempBlocks && (TempBlock.isTempBlock(block) && !WaterAbility.isBendableWaterTempBlock(block))) { } else if (ignoreTempBlocks && (TempBlock.isTempBlock(block) && !WaterAbility.isBendableWaterTempBlock(block) && !EarthAbility.isBendableEarthTempBlock(block))) {
continue; continue;
} else { } else {
location.subtract(vec); location.subtract(vec);
@ -1564,7 +1542,7 @@ public class GeneralMethods {
final boolean respectGriefPrevention = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectGriefPrevention"); final boolean respectGriefPrevention = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectGriefPrevention");
final boolean respectLWC = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectLWC"); final boolean respectLWC = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectLWC");
final boolean respectResidence = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Residence.Respect"); final boolean respectResidence = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Residence.Respect");
final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectKingdoms"); final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Kingdoms.Respect");
final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectRedProtect"); final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectRedProtect");
boolean isIgnite = false; boolean isIgnite = false;
@ -1658,38 +1636,8 @@ public class GeneralMethods {
} }
if (twnp != null && respectTowny) { if (twnp != null && respectTowny) {
final Towny twn = (Towny) twnp; if (!PlayerCacheUtil.getCachePermission(player, location, Material.DIRT, ActionType.BUILD)) {
return true;
WorldCoord worldCoord;
try {
final TownyWorld tWorld = TownyUniverse.getDataSource().getWorld(world.getName());
worldCoord = new WorldCoord(tWorld.getName(), Coord.parseCoord(location));
final boolean bBuild = PlayerCacheUtil.getCachePermission(player, location, Material.DIRT, TownyPermission.ActionType.BUILD);
if (!bBuild) {
final PlayerCache cache = twn.getCache(player);
final TownBlockStatus status = cache.getStatus();
if (((status == TownBlockStatus.ENEMY) && TownyWarConfig.isAllowingAttacks())) {
try {
TownyWar.callAttackCellEvent(twn, player, location.getBlock(), worldCoord);
} catch (final Exception e) {
TownyMessaging.sendErrorMsg(player, e.getMessage());
}
return true;
} else if (status == TownBlockStatus.WARZONE) {
} else {
return true;
}
if ((cache.hasBlockErrMsg())) {
TownyMessaging.sendErrorMsg(player, cache.getBlockErrMsg());
}
}
} catch (final Exception e1) {
TownyMessaging.sendErrorMsg(player, TownySettings.getLangString("msg_err_not_configured"));
} }
} }
@ -1719,18 +1667,22 @@ public class GeneralMethods {
} }
if (kingdoms != null && respectKingdoms) { if (kingdoms != null && respectKingdoms) {
final KingdomPlayer kPlayer = GameManagement.getPlayerManager().getOfflineKingdomPlayer(player).getKingdomPlayer(); final KingdomPlayer kPlayer = KingdomPlayer.getKingdomPlayer(player);
if (kPlayer.getKingdom() != null) { final Land land = Land.getLand(location);
final SimpleChunkLocation chunkLocation = new SimpleChunkLocation(location.getChunk()); final boolean protectDuringInvasions = ConfigManager.getConfig().getBoolean("Properties.RegionProtection.Kingdoms.ProtectDuringInvasions");
final Land land = GameManagement.getLandManager().getOrLoadLand(chunkLocation); if (land != null) {
final UUID owner = land.getOwnerUUID(); final Kingdom kingdom = land.getKingdom();
if (owner != null) { if (kPlayer.isAdmin()
if (!kPlayer.getKingdom().getKing().equals(owner)) { || (!protectDuringInvasions && !land.getInvasions().isEmpty() && land.getInvasions().values().stream().anyMatch(i -> i.getInvader().equals(kPlayer))) // Protection during invasions is off, and player is currently invading; allow
return true; || (land.getStructure() != null && land.getStructure() instanceof Regulator && ((Regulator) land.getStructure()).hasAttribute(player, Attribute.BUILD))) { // There is a regulator on site which allows the player to build; allow
} return false;
}
if (!kPlayer.hasKingdom() // Player has no kingdom; deny
|| (kPlayer.getKingdom().equals(kingdom) && !kPlayer.hasPermission(DefaultKingdomPermission.BUILD)) // Player is a member of this kingdom but cannot build here; deny
|| (!kPlayer.getKingdom().equals(kingdom) && !kPlayer.getKingdom().hasAttribute(kingdom, KingdomRelation.Attribute.BUILD))) { // Player is not a member of this kingdom and cannot build here; deny
return true;
} }
} }
} }
if (redprotect != null && respectRedProtect) { if (redprotect != null && respectRedProtect) {
@ -1928,6 +1880,7 @@ public class GeneralMethods {
GeneralMethods.createBendingPlayer(player.getUniqueId(), player.getName()); GeneralMethods.createBendingPlayer(player.getUniqueId(), player.getName());
PassiveManager.registerPassives(player); PassiveManager.registerPassives(player);
} }
BendingBoardManager.reload();
plugin.updater.checkUpdate(); plugin.updater.checkUpdate();
ProjectKorra.log.info("Reload complete"); ProjectKorra.log.info("Reload complete");
} }
@ -2064,7 +2017,7 @@ public class GeneralMethods {
final boolean respectGriefPrevention = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectGriefPrevention"); final boolean respectGriefPrevention = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectGriefPrevention");
final boolean respectLWC = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectLWC"); final boolean respectLWC = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectLWC");
final boolean respectResidence = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Residence.Respect"); final boolean respectResidence = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Residence.Respect");
final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Kingdoms"); final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Kingdoms.Respect");
final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RedProtect"); final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RedProtect");
final PluginManager pm = Bukkit.getPluginManager(); final PluginManager pm = Bukkit.getPluginManager();
@ -2314,39 +2267,6 @@ public class GeneralMethods {
DBConnection.sql.modifyQuery("UPDATE pk_players SET permaremoved = '" + (permaRemoved ? "true" : "false") + "' WHERE uuid = '" + uuid + "'"); DBConnection.sql.modifyQuery("UPDATE pk_players SET permaremoved = '" + (permaRemoved ? "true" : "false") + "' WHERE uuid = '" + uuid + "'");
} }
public static void setVelocity(final Entity entity, final Vector velocity) {
if (entity instanceof TNTPrimed) {
if (ConfigManager.defaultConfig.get().getBoolean("Properties.BendingAffectFallingSand.TNT")) {
velocity.multiply(ConfigManager.defaultConfig.get().getDouble("Properties.BendingAffectFallingSand.TNTStrengthMultiplier"));
}
} else if (entity instanceof FallingBlock) {
if (ConfigManager.defaultConfig.get().getBoolean("Properties.BendingAffectFallingSand.Normal")) {
velocity.multiply(ConfigManager.defaultConfig.get().getDouble("Properties.BendingAffectFallingSand.NormalStrengthMultiplier"));
}
}
// Attempt to stop velocity from going over the packet cap.
if (velocity.getX() > 4) {
velocity.setX(4);
} else if (velocity.getX() < -4) {
velocity.setX(-4);
}
if (velocity.getY() > 4) {
velocity.setY(4);
} else if (velocity.getY() < -4) {
velocity.setY(-4);
}
if (velocity.getZ() > 4) {
velocity.setZ(4);
} else if (velocity.getZ() < -4) {
velocity.setZ(-4);
}
entity.setVelocity(velocity);
}
public static FallingBlock spawnFallingBlock(final Location loc, final Material type) { public static FallingBlock spawnFallingBlock(final Location loc, final Material type) {
return spawnFallingBlock(loc, type, type.createBlockData()); return spawnFallingBlock(loc, type, type.createBlockData());
} }
@ -2483,9 +2403,10 @@ public class GeneralMethods {
} }
final File saveTo = new File(plugin.getDataFolder(), "debug.txt"); final File saveTo = new File(plugin.getDataFolder(), "debug.txt");
if (!saveTo.exists()) { if (saveTo.exists()) {
saveTo.createNewFile(); saveTo.delete();
} }
saveTo.createNewFile();
final FileWriter fw = new FileWriter(saveTo, true); final FileWriter fw = new FileWriter(saveTo, true);
final PrintWriter pw = new PrintWriter(fw); final PrintWriter pw = new PrintWriter(fw);
@ -2532,4 +2453,51 @@ public class GeneralMethods {
return false; return false;
} }
} }
@Deprecated
public static void setVelocity(Entity entity, Vector vector) {
setVelocity(null,entity,vector);
}
public static void setVelocity(Ability ability, Entity entity, Vector vector) {
final AbilityVelocityAffectEntityEvent event = new AbilityVelocityAffectEntityEvent(ability, entity, vector);
Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled())
return;
Vector velocity = event.getVelocity();
if(velocity == null || Double.isNaN(velocity.length()))
return;
if (entity instanceof TNTPrimed) {
if (ConfigManager.defaultConfig.get().getBoolean("Properties.BendingAffectFallingSand.TNT")) {
velocity.multiply(ConfigManager.defaultConfig.get().getDouble("Properties.BendingAffectFallingSand.TNTStrengthMultiplier"));
}
} else if (entity instanceof FallingBlock) {
if (ConfigManager.defaultConfig.get().getBoolean("Properties.BendingAffectFallingSand.Normal")) {
velocity.multiply(ConfigManager.defaultConfig.get().getDouble("Properties.BendingAffectFallingSand.NormalStrengthMultiplier"));
}
}
// Attempt to stop velocity from going over the packet cap.
if (velocity.getX() > 4) {
velocity.setX(4);
} else if (velocity.getX() < -4) {
velocity.setX(-4);
}
if (velocity.getY() > 4) {
velocity.setY(4);
} else if (velocity.getY() < -4) {
velocity.setY(-4);
}
if (velocity.getZ() > 4) {
velocity.setZ(4);
} else if (velocity.getZ() < -4) {
velocity.setZ(-4);
}
event.getAffected().setVelocity(velocity);
}
} }

93
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -103,6 +103,7 @@ import com.projectkorra.projectkorra.airbending.Tornado;
import com.projectkorra.projectkorra.airbending.flight.FlightMultiAbility; import com.projectkorra.projectkorra.airbending.flight.FlightMultiAbility;
import com.projectkorra.projectkorra.airbending.passive.GracefulDescent; import com.projectkorra.projectkorra.airbending.passive.GracefulDescent;
import com.projectkorra.projectkorra.avatar.AvatarState; import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.board.BendingBoardManager;
import com.projectkorra.projectkorra.chiblocking.AcrobatStance; import com.projectkorra.projectkorra.chiblocking.AcrobatStance;
import com.projectkorra.projectkorra.chiblocking.HighJump; import com.projectkorra.projectkorra.chiblocking.HighJump;
import com.projectkorra.projectkorra.chiblocking.Paralyze; import com.projectkorra.projectkorra.chiblocking.Paralyze;
@ -137,10 +138,15 @@ import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
import com.projectkorra.projectkorra.earthbending.passive.DensityShift; import com.projectkorra.projectkorra.earthbending.passive.DensityShift;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive; import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.earthbending.passive.FerroControl; import com.projectkorra.projectkorra.earthbending.passive.FerroControl;
import com.projectkorra.projectkorra.event.BendingPlayerCreationEvent;
import com.projectkorra.projectkorra.event.EntityBendingDeathEvent; import com.projectkorra.projectkorra.event.EntityBendingDeathEvent;
import com.projectkorra.projectkorra.event.HorizontalVelocityChangeEvent; import com.projectkorra.projectkorra.event.HorizontalVelocityChangeEvent;
import com.projectkorra.projectkorra.event.PlayerBindChangeEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent; import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;
import com.projectkorra.projectkorra.event.PlayerCooldownChangeEvent;
import com.projectkorra.projectkorra.event.PlayerJumpEvent; import com.projectkorra.projectkorra.event.PlayerJumpEvent;
import com.projectkorra.projectkorra.event.PlayerStanceChangeEvent;
import com.projectkorra.projectkorra.firebending.Blaze; import com.projectkorra.projectkorra.firebending.Blaze;
import com.projectkorra.projectkorra.firebending.BlazeRing; import com.projectkorra.projectkorra.firebending.BlazeRing;
import com.projectkorra.projectkorra.firebending.FireBlast; import com.projectkorra.projectkorra.firebending.FireBlast;
@ -877,7 +883,7 @@ public class PKListener implements Listener {
new AirBurst(player, true); new AirBurst(player, true);
} }
} }
CoreAbility gd = CoreAbility.getAbility(GracefulDescent.class); CoreAbility gd = CoreAbility.getAbility(GracefulDescent.class);
CoreAbility ds = CoreAbility.getAbility(DensityShift.class); CoreAbility ds = CoreAbility.getAbility(DensityShift.class);
CoreAbility hs = CoreAbility.getAbility(HydroSink.class); CoreAbility hs = CoreAbility.getAbility(HydroSink.class);
@ -918,7 +924,7 @@ public class PKListener implements Listener {
} }
CoreAbility hc = CoreAbility.getAbility(HeatControl.class); CoreAbility hc = CoreAbility.getAbility(HeatControl.class);
if (hc != null && bPlayer.hasElement(Element.FIRE) && bPlayer.canBendPassive(hc) && bPlayer.canUsePassive(hc) && (event.getCause() == DamageCause.FIRE || event.getCause() == DamageCause.FIRE_TICK)) { if (hc != null && bPlayer.hasElement(Element.FIRE) && bPlayer.canBendPassive(hc) && bPlayer.canUsePassive(hc) && (event.getCause() == DamageCause.FIRE || event.getCause() == DamageCause.FIRE_TICK)) {
event.setCancelled(!HeatControl.canBurn(player)); event.setCancelled(!HeatControl.canBurn(player));
} }
@ -1240,6 +1246,7 @@ public class PKListener implements Listener {
@EventHandler @EventHandler
public void onPlayerChangeWorld(final PlayerChangedWorldEvent event) { public void onPlayerChangeWorld(final PlayerChangedWorldEvent event) {
PassiveManager.registerPassives(event.getPlayer()); PassiveManager.registerPassives(event.getPlayer());
BendingBoardManager.forceToggleScoreboard(event.getPlayer());
} }
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
@ -1353,6 +1360,8 @@ public class PKListener implements Listener {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
BendingBoardManager.clean(player);
if (ProjectKorra.isStatisticsEnabled()) { if (ProjectKorra.isStatisticsEnabled()) {
Manager.getManager(StatisticsManager.class).store(player.getUniqueId()); Manager.getManager(StatisticsManager.class).store(player.getUniqueId());
} }
@ -1535,6 +1544,8 @@ public class PKListener implements Listener {
new EarthTunnel(player); new EarthTunnel(player);
} else if (abil.equalsIgnoreCase("Tremorsense")) { } else if (abil.equalsIgnoreCase("Tremorsense")) {
bPlayer.toggleTremorSense(); bPlayer.toggleTremorSense();
GeneralMethods.displayMovePreview(player);
BendingBoardManager.updateAllSlots(player);
} else if (abil.equalsIgnoreCase("Extraction")) { } else if (abil.equalsIgnoreCase("Extraction")) {
new Extraction(player); new Extraction(player);
} else if (abil.equalsIgnoreCase("LavaFlow")) { } else if (abil.equalsIgnoreCase("LavaFlow")) {
@ -1583,15 +1594,18 @@ public class PKListener implements Listener {
} }
} }
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerSlotChange(final PlayerItemHeldEvent event) { public void onPlayerSlotChange(final PlayerItemHeldEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final int slot = event.getNewSlot() + 1; if (!MultiAbilityManager.canChangeSlot(player, event.getNewSlot())) {
event.setCancelled(true);
if (ConfigManager.defaultConfig.get().getBoolean("Properties.BendingPreview")) { return;
GeneralMethods.displayMovePreview(player, slot);
} }
final int slot = event.getNewSlot() + 1;
GeneralMethods.displayMovePreview(player, slot);
BendingBoardManager.changeActiveSlot(player, event.getPreviousSlot(), event.getNewSlot());
if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Water.WaterArms.DisplayBoundMsg")) { if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Water.WaterArms.DisplayBoundMsg")) {
final WaterArms waterArms = CoreAbility.getAbility(player, WaterArms.class); final WaterArms waterArms = CoreAbility.getAbility(player, WaterArms.class);
if (waterArms != null) { if (waterArms != null) {
@ -1794,6 +1808,8 @@ public class PKListener implements Listener {
} else if (abil.equalsIgnoreCase("Illumination")) { } else if (abil.equalsIgnoreCase("Illumination")) {
if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Fire.Illumination.Passive")) { if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Fire.Illumination.Passive")) {
bPlayer.toggleIllumination(); bPlayer.toggleIllumination();
GeneralMethods.displayMovePreview(player);
BendingBoardManager.updateAllSlots(player);
} else { } else {
new Illumination(player); new Illumination(player);
} }
@ -1835,6 +1851,8 @@ public class PKListener implements Listener {
if (coreAbil instanceof AvatarAbility) { if (coreAbil instanceof AvatarAbility) {
if (abil.equalsIgnoreCase("AvatarState")) { if (abil.equalsIgnoreCase("AvatarState")) {
new AvatarState(player); new AvatarState(player);
GeneralMethods.displayMovePreview(player);
BendingBoardManager.updateAllSlots(player);
} }
} }
} }
@ -1906,26 +1924,26 @@ public class PKListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
} }
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
if (event.getEntity() instanceof LivingEntity) { if (event.getEntity() instanceof LivingEntity) {
LivingEntity lent = (LivingEntity) event.getEntity(); LivingEntity lent = (LivingEntity) event.getEntity();
if (TempArmor.hasTempArmor(lent)) { if (TempArmor.hasTempArmor(lent)) {
TempArmor armor = TempArmor.getVisibleTempArmor(lent); TempArmor armor = TempArmor.getVisibleTempArmor(lent);
ItemStack is = event.getItem().getItemStack(); ItemStack is = event.getItem().getItemStack();
int index = GeneralMethods.getArmorIndex(is.getType()); int index = GeneralMethods.getArmorIndex(is.getType());
if (index == -1) { if (index == -1) {
return; return;
} }
event.setCancelled(true); event.setCancelled(true);
ItemStack prev = armor.getOldArmor()[index]; ItemStack prev = armor.getOldArmor()[index];
if (GeneralMethods.compareArmor(is.getType(), prev.getType()) > 0) { if (GeneralMethods.compareArmor(is.getType(), prev.getType()) > 0) {
event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), prev); event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), prev);
armor.getOldArmor()[index] = is; armor.getOldArmor()[index] = is;
@ -1973,6 +1991,53 @@ public class PKListener implements Listener {
} }
} }
@EventHandler(priority = EventPriority.MONITOR)
public void onBendingElementChange(final PlayerChangeElementEvent event) {
final Player player = event.getTarget();
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
if (bPlayer == null) return;
if (event.getResult() == PlayerChangeElementEvent.Result.CHOOSE || event.getResult() == PlayerChangeElementEvent.Result.REMOVE || event.getResult() == PlayerChangeElementEvent.Result.PERMAREMOVE) {
BendingBoardManager.updateAllSlots(player);
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onBendingSubElementChange(final PlayerChangeSubElementEvent event) {
final Player player = event.getTarget();
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
if (bPlayer == null) return;
if (event.getResult() == PlayerChangeSubElementEvent.Result.CHOOSE || event.getResult() == PlayerChangeSubElementEvent.Result.REMOVE || event.getResult() == PlayerChangeSubElementEvent.Result.PERMAREMOVE) {
BendingBoardManager.updateAllSlots(player);
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onBindChange(final PlayerBindChangeEvent event) {
final Player player = event.getPlayer();
if (player == null) return;
BendingBoardManager.updateBoard(player, event.getAbility(), false, event.getSlot());
}
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerStanceChange(final PlayerStanceChangeEvent event) {
final Player player = event.getPlayer();
if (player == null) return;
if (!event.getOldStance().isEmpty()) {
BendingBoardManager.updateBoard(player, event.getOldStance(), false, 0);
}
if (!event.getNewStance().isEmpty()) {
BendingBoardManager.updateBoard(player, event.getNewStance(), false, 0);
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onBendingPlayerCreation(final BendingPlayerCreationEvent event) {
final Player player = event.getBendingPlayer().getPlayer();
BendingBoardManager.canUseScoreboard(player);
}
public static HashMap<Player, String> getBendingPlayerDeath() { public static HashMap<Player, String> getBendingPlayerDeath() {
return BENDING_PLAYER_DEATH; return BENDING_PLAYER_DEATH;
} }

2
src/com/projectkorra/projectkorra/ProjectKorra.java
View file

@ -22,6 +22,7 @@ import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager; import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.ability.util.PassiveManager; import com.projectkorra.projectkorra.ability.util.PassiveManager;
import com.projectkorra.projectkorra.airbending.util.AirbendingManager; import com.projectkorra.projectkorra.airbending.util.AirbendingManager;
import com.projectkorra.projectkorra.board.BendingBoardManager;
import com.projectkorra.projectkorra.chiblocking.util.ChiblockingManager; import com.projectkorra.projectkorra.chiblocking.util.ChiblockingManager;
import com.projectkorra.projectkorra.command.Commands; import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager; import com.projectkorra.projectkorra.configuration.ConfigManager;
@ -77,6 +78,7 @@ public class ProjectKorra extends JavaPlugin {
} }
Manager.startup(); Manager.startup();
BendingBoardManager.setup();
this.getServer().getPluginManager().registerEvents(new PKListener(this), this); this.getServer().getPluginManager().registerEvents(new PKListener(this), this);
this.getServer().getScheduler().scheduleSyncRepeatingTask(this, new BendingManager(), 0, 1); this.getServer().getScheduler().scheduleSyncRepeatingTask(this, new BendingManager(), 0, 1);

26
src/com/projectkorra/projectkorra/ability/CoreAbility.java
View file

@ -90,6 +90,7 @@ public abstract class CoreAbility implements Ability {
private static final Map<Class<? extends CoreAbility>, Map<String, Field>> ATTRIBUTE_FIELDS = new HashMap<>(); private static final Map<Class<? extends CoreAbility>, Map<String, Field>> ATTRIBUTE_FIELDS = new HashMap<>();
private static int idCounter; private static int idCounter;
private static long currentTick;
protected Player player; protected Player player;
protected BendingPlayer bPlayer; protected BendingPlayer bPlayer;
@ -149,7 +150,6 @@ public abstract class CoreAbility implements Ability {
this.startTime = System.currentTimeMillis(); this.startTime = System.currentTimeMillis();
this.started = false; this.started = false;
this.id = CoreAbility.idCounter; this.id = CoreAbility.idCounter;
this.startTick = this.getCurrentTick();
if (idCounter == Integer.MAX_VALUE) { if (idCounter == Integer.MAX_VALUE) {
idCounter = Integer.MIN_VALUE; idCounter = Integer.MIN_VALUE;
@ -181,6 +181,7 @@ public abstract class CoreAbility implements Ability {
this.started = true; this.started = true;
this.startTime = System.currentTimeMillis(); this.startTime = System.currentTimeMillis();
this.startTick = getCurrentTick();
final Class<? extends CoreAbility> clazz = this.getClass(); final Class<? extends CoreAbility> clazz = this.getClass();
final UUID uuid = this.player.getUniqueId(); final UUID uuid = this.player.getUniqueId();
@ -291,6 +292,7 @@ public abstract class CoreAbility implements Ability {
} }
} }
} }
currentTick++;
} }
/** /**
@ -745,8 +747,12 @@ public abstract class CoreAbility implements Ability {
return this.startTick; return this.startTick;
} }
public long getCurrentTick() { public static long getCurrentTick() {
return this.player.getWorld().getFullTime(); return currentTick;
}
public long getRunningTicks() {
return currentTick - this.startTick;
} }
public boolean isStarted() { public boolean isStarted() {
@ -828,7 +834,7 @@ public abstract class CoreAbility implements Ability {
public String getMovePreview(final Player player) { public String getMovePreview(final Player player) {
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
String displayedMessage = getMovePreviewWithoutCooldownTimer(player); String displayedMessage = getMovePreviewWithoutCooldownTimer(player, false);
if (bPlayer.isOnCooldown(this)) { if (bPlayer.isOnCooldown(this)) {
final long cooldown = bPlayer.getCooldown(this.getName()) - System.currentTimeMillis(); final long cooldown = bPlayer.getCooldown(this.getName()) - System.currentTimeMillis();
displayedMessage += this.getElement().getColor() + " - " + TimeUtil.formatTime(cooldown); displayedMessage += this.getElement().getColor() + " - " + TimeUtil.formatTime(cooldown);
@ -837,18 +843,24 @@ public abstract class CoreAbility implements Ability {
return displayedMessage; return displayedMessage;
} }
public String getMovePreviewWithoutCooldownTimer(final Player player) { public String getMovePreviewWithoutCooldownTimer(final Player player, boolean forceCooldown) {
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
String displayedMessage = ""; String displayedMessage = "";
if (bPlayer.isOnCooldown(this)) { if (forceCooldown || bPlayer.isOnCooldown(this)) {
displayedMessage = this.getElement().getColor() + "" + ChatColor.STRIKETHROUGH + this.getName(); displayedMessage = this.getElement().getColor() + "" + ChatColor.STRIKETHROUGH + this.getName();
} else { } else {
if (bPlayer.getStance() != null && bPlayer.getStance().getName().equals(this.getName())) { boolean isActiveStance = bPlayer.getStance() != null && bPlayer.getStance().getName().equals(this.getName());
boolean isActiveAvatarState = bPlayer.isAvatarState() && this.getName().equals("AvatarState");
boolean isActiveIllumination = bPlayer.isIlluminating() && this.getName().equals("Illumination");
boolean isActiveTremorSense = bPlayer.isTremorSensing() && this.getName().equals("Tremorsense");
if (isActiveStance || isActiveAvatarState || isActiveIllumination || isActiveTremorSense) {
displayedMessage = this.getElement().getColor() + "" + ChatColor.UNDERLINE + this.getName(); displayedMessage = this.getElement().getColor() + "" + ChatColor.UNDERLINE + this.getName();
} else { } else {
displayedMessage = this.getElement().getColor() + this.getName(); displayedMessage = this.getElement().getColor() + this.getName();
} }
} }
return displayedMessage; return displayedMessage;
} }

15
src/com/projectkorra/projectkorra/ability/EarthAbility.java
View file

@ -90,6 +90,14 @@ public abstract class EarthAbility extends ElementalAbility {
ParticleEffect.BLOCK_CRACK.display(collision.getLocationFirst(), 10, 1, 1, 1, 0.1, Material.DIRT.createBlockData()); ParticleEffect.BLOCK_CRACK.display(collision.getLocationFirst(), 10, 1, 1, 1, 0.1, Material.DIRT.createBlockData());
} }
} }
public static boolean isBendableEarthTempBlock(final Block block) {
return isBendableEarthTempBlock(TempBlock.get(block));
}
public static boolean isBendableEarthTempBlock(final TempBlock tempBlock) {
return DensityShift.getSandBlocks().contains(tempBlock);
}
public static boolean isEarthbendable(final Material material, final boolean metal, final boolean sand, final boolean lava) { public static boolean isEarthbendable(final Material material, final boolean metal, final boolean sand, final boolean lava) {
return isEarth(material) || (metal && isMetal(material)) || (sand && isSand(material)) || (lava && isLava(material)); return isEarth(material) || (metal && isMetal(material)) || (sand && isSand(material)) || (lava && isLava(material));
@ -128,7 +136,7 @@ public abstract class EarthAbility extends ElementalAbility {
} }
public boolean moveEarth(Block block, final Vector direction, final int chainlength, final boolean throwplayer) { public boolean moveEarth(Block block, final Vector direction, final int chainlength, final boolean throwplayer) {
if (!TempBlock.isTempBlock(block) && this.isEarthbendable(block) && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) { if ((!TempBlock.isTempBlock(block) || isBendableEarthTempBlock(block)) && this.isEarthbendable(block) && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
boolean up = false; boolean up = false;
boolean down = false; boolean down = false;
final Vector norm = direction.clone().normalize(); final Vector norm = direction.clone().normalize();
@ -170,13 +178,14 @@ public abstract class EarthAbility extends ElementalAbility {
final LivingEntity lentity = (LivingEntity) entity; final LivingEntity lentity = (LivingEntity) entity;
if (lentity.getEyeLocation().getBlockX() == affectedblock.getX() && lentity.getEyeLocation().getBlockZ() == affectedblock.getZ()) { if (lentity.getEyeLocation().getBlockX() == affectedblock.getX() && lentity.getEyeLocation().getBlockZ() == affectedblock.getZ()) {
if (!(entity instanceof FallingBlock)) { if (!(entity instanceof FallingBlock)) {
entity.setVelocity(norm.clone().multiply(.75)); GeneralMethods.setVelocity(this, entity, norm.clone().multiply(.75));
} }
} }
} else { } else {
if (entity.getLocation().getBlockX() == affectedblock.getX() && entity.getLocation().getBlockZ() == affectedblock.getZ()) { if (entity.getLocation().getBlockX() == affectedblock.getX() && entity.getLocation().getBlockZ() == affectedblock.getZ()) {
if (!(entity instanceof FallingBlock)) { if (!(entity instanceof FallingBlock)) {
entity.setVelocity(norm.clone().multiply(.75)); GeneralMethods.setVelocity(this, entity, norm.clone().multiply(.75));
} }
} }
} }

2
src/com/projectkorra/projectkorra/ability/FireAbility.java
View file

@ -87,7 +87,7 @@ public abstract class FireAbility extends ElementalAbility {
} }
public double getDayFactor(final double value) { public double getDayFactor(final double value) {
return this.player != null ? value * getDayFactor() : 1; return (this.player != null && isDay(player.getWorld())) ? value * getDayFactor() : value;
} }
public static double getDayFactor() { public static double getDayFactor() {

43
src/com/projectkorra/projectkorra/ability/util/MultiAbilityManager.java
View file

@ -33,7 +33,6 @@ public class MultiAbilityManager {
waterArms.add(new MultiAbilityInfoSub("Freeze", Element.ICE)); waterArms.add(new MultiAbilityInfoSub("Freeze", Element.ICE));
waterArms.add(new MultiAbilityInfoSub("Spear", Element.ICE)); waterArms.add(new MultiAbilityInfoSub("Spear", Element.ICE));
multiAbilityList.add(new MultiAbilityInfo("WaterArms", waterArms)); multiAbilityList.add(new MultiAbilityInfo("WaterArms", waterArms));
manage();
} }
/** /**
@ -135,22 +134,7 @@ public class MultiAbilityManager {
return false; return false;
} }
if (playerAbilities.containsKey(player)) { return playerAbilities.containsKey(player) && playerBoundAbility.get(player).equals(multiAbility);
if (!playerBoundAbility.get(player).equals(multiAbility) && bPlayer.getBoundAbility() != null) {
return false;
}
return true;
}
return false;
}
public static void manage() {
new BukkitRunnable() {
@Override
public void run() {
scrollHotBarSlots();
}
}.runTaskTimer(ProjectKorra.plugin, 0, 1);
} }
/** /**
@ -176,24 +160,17 @@ public class MultiAbilityManager {
/** /**
* Keeps track of the player's selected slot while a MultiAbility is active. * Keeps track of the player's selected slot while a MultiAbility is active.
*/ */
public static void scrollHotBarSlots() { public static boolean canChangeSlot(final Player player, int slot) {
if (!playerAbilities.isEmpty()) { if (playerAbilities.isEmpty()) {
for (final Player player : playerAbilities.keySet()) { return true;
final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); }
if (bPlayer == null) { final BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
continue; if (bPlayer != null) {
} if (bPlayer.getBoundAbility() == null && multiAbilityList.contains(getMultiAbility(playerBoundAbility.getOrDefault(player, "")))) {
if (playerBoundAbility.containsKey(player)) { return slot < getMultiAbility(playerBoundAbility.get(player)).getAbilities().size();
if (bPlayer.getBoundAbility() == null) {
if (multiAbilityList.contains(getMultiAbility(playerBoundAbility.get(player)))) {
if (player.getInventory().getHeldItemSlot() >= getMultiAbility(playerBoundAbility.get(player)).getAbilities().size()) {
player.getInventory().setHeldItemSlot(getMultiAbility(playerBoundAbility.get(player)).getAbilities().size() - 1);
}
}
}
}
} }
} }
return true;
} }
/** /**

3
src/com/projectkorra/projectkorra/airbending/AirBlast.java
View file

@ -280,8 +280,7 @@ public class AirBlast extends AirAbility {
if (Math.abs(entity.getVelocity().dot(push)) > knockback && entity.getVelocity().angle(push) > Math.PI / 3) { if (Math.abs(entity.getVelocity().dot(push)) > knockback && entity.getVelocity().angle(push) > Math.PI / 3) {
push.normalize().add(entity.getVelocity()).multiply(knockback); push.normalize().add(entity.getVelocity()).multiply(knockback);
} }
GeneralMethods.setVelocity(this, entity, push);
GeneralMethods.setVelocity(entity, push);
if (this.source != null) { if (this.source != null) {
new HorizontalVelocityTracker(entity, this.player, 200l, this.source); new HorizontalVelocityTracker(entity, this.player, 200l, this.source);

4
src/com/projectkorra/projectkorra/airbending/AirScooter.java
View file

@ -201,9 +201,9 @@ public class AirScooter extends AirAbility {
this.player.setSprinting(false); this.player.setSprinting(false);
this.player.removePotionEffect(PotionEffectType.SPEED); this.player.removePotionEffect(PotionEffectType.SPEED);
if (this.useslime) { if (this.useslime) {
this.slime.setVelocity(velocity); GeneralMethods.setVelocity(this, this.slime, velocity);
} else { } else {
this.player.setVelocity(velocity); GeneralMethods.setVelocity(this, this.player, velocity);
} }
if (this.random.nextInt(4) == 0) { if (this.random.nextInt(4) == 0) {

2
src/com/projectkorra/projectkorra/airbending/AirShield.java
View file

@ -162,7 +162,7 @@ public class AirShield extends AirAbility {
} }
velocity.multiply(0.5); velocity.multiply(0.5);
GeneralMethods.setVelocity(entity, velocity); GeneralMethods.setVelocity(this, entity, velocity);
entity.setFallDistance(0); entity.setFallDistance(0);
} }
} }

4
src/com/projectkorra/projectkorra/airbending/AirSuction.java
View file

@ -231,8 +231,8 @@ public class AirSuction extends AirAbility {
if (Math.abs(entity.getVelocity().dot(push)) > knockback) { if (Math.abs(entity.getVelocity().dot(push)) > knockback) {
push.normalize().add(entity.getVelocity()).multiply(knockback); push.normalize().add(entity.getVelocity()).multiply(knockback);
} }
GeneralMethods.setVelocity(this, entity, push.normalize().multiply(knockback));
GeneralMethods.setVelocity(entity, push.normalize().multiply(knockback));
new HorizontalVelocityTracker(entity, this.player, 200l, this); new HorizontalVelocityTracker(entity, this.player, 200l, this);
entity.setFallDistance(0); entity.setFallDistance(0);

8
src/com/projectkorra/projectkorra/airbending/AirSwipe.java
View file

@ -243,9 +243,7 @@ public class AirSwipe extends AirAbility {
} }
} }
if (entities.size() < MAX_AFFECTABLE_ENTITIES) { if (entities.size() < MAX_AFFECTABLE_ENTITIES) {
GeneralMethods.setVelocity(AirSwipe.this, entity, fDirection.multiply(AirSwipe.this.pushFactor));
GeneralMethods.setVelocity(entity, fDirection.multiply(AirSwipe.this.pushFactor));
} }
if (!AirSwipe.this.affectedEntities.contains(entity)) { if (!AirSwipe.this.affectedEntities.contains(entity)) {
if (AirSwipe.this.damage != 0) { if (AirSwipe.this.damage != 0) {
@ -255,9 +253,7 @@ public class AirSwipe extends AirAbility {
} }
breakBreathbendingHold(entity); breakBreathbendingHold(entity);
} else if (entity.getEntityId() != AirSwipe.this.player.getEntityId() && !(entity instanceof LivingEntity)) { } else if (entity.getEntityId() != AirSwipe.this.player.getEntityId() && !(entity instanceof LivingEntity)) {
GeneralMethods.setVelocity(AirSwipe.this, entity, fDirection.multiply(AirSwipe.this.pushFactor));
GeneralMethods.setVelocity(entity, fDirection.multiply(AirSwipe.this.pushFactor));
} }
} }
}.runTaskLater(ProjectKorra.plugin, i / MAX_AFFECTABLE_ENTITIES); }.runTaskLater(ProjectKorra.plugin, i / MAX_AFFECTABLE_ENTITIES);

2
src/com/projectkorra/projectkorra/airbending/Tornado.java
View file

@ -169,7 +169,7 @@ public class Tornado extends AirAbility {
velocity.setZ(vz); velocity.setZ(vz);
velocity.setY(vy); velocity.setY(vy);
velocity.multiply(timefactor); velocity.multiply(timefactor);
GeneralMethods.setVelocity(entity, velocity); GeneralMethods.setVelocity(this, entity, velocity);
entity.setFallDistance(0); entity.setFallDistance(0);
breakBreathbendingHold(entity); breakBreathbendingHold(entity);

2
src/com/projectkorra/projectkorra/airbending/combo/AirStream.java
View file

@ -165,7 +165,7 @@ public class AirStream extends AirAbility implements ComboAbility {
continue; continue;
} }
final Vector force = GeneralMethods.getDirection(entity.getLocation(), this.currentLoc); final Vector force = GeneralMethods.getDirection(entity.getLocation(), this.currentLoc);
entity.setVelocity(force.clone().normalize().multiply(this.speed)); GeneralMethods.setVelocity(this, entity, force.clone().normalize().multiply(this.speed));
entity.setFallDistance(0F); entity.setFallDistance(0F);
} }
} }

2
src/com/projectkorra/projectkorra/airbending/combo/AirSweep.java
View file

@ -198,7 +198,7 @@ public class AirSweep extends AirAbility implements ComboAbility {
if (!entity.equals(this.player) && !(entity instanceof Player && Commands.invincible.contains(((Player) entity).getName()))) { if (!entity.equals(this.player) && !(entity instanceof Player && Commands.invincible.contains(((Player) entity).getName()))) {
if (this.knockback != 0) { if (this.knockback != 0) {
final Vector force = fstream.getLocation().getDirection(); final Vector force = fstream.getLocation().getDirection();
GeneralMethods.setVelocity(entity, force.clone().multiply(this.knockback)); GeneralMethods.setVelocity(this, entity, force.clone().multiply(this.knockback));
new HorizontalVelocityTracker(entity, this.player, 200l, this); new HorizontalVelocityTracker(entity, this.player, 200l, this);
entity.setFallDistance(0); entity.setFallDistance(0);
} }

2
src/com/projectkorra/projectkorra/airbending/combo/Twister.java
View file

@ -146,7 +146,7 @@ public class Twister extends AirAbility implements ComboAbility {
continue; continue;
} }
final Vector forceDir = GeneralMethods.getDirection(entity.getLocation(), this.currentLoc.clone().add(0, height, 0)); final Vector forceDir = GeneralMethods.getDirection(entity.getLocation(), this.currentLoc.clone().add(0, height, 0));
entity.setVelocity(forceDir.clone().normalize().multiply(0.3)); GeneralMethods.setVelocity(this, entity, forceDir.clone().normalize().multiply(0.3));
} }
} }

4
src/com/projectkorra/projectkorra/airbending/flight/FlightMultiAbility.java
View file

@ -227,14 +227,14 @@ public class FlightMultiAbility extends FlightAbility implements MultiAbility {
if (!GeneralMethods.isRegionProtectedFromBuild(this.player, e.getLocation())) { if (!GeneralMethods.isRegionProtectedFromBuild(this.player, e.getLocation())) {
final LivingEntity le = (LivingEntity) e; final LivingEntity le = (LivingEntity) e;
DamageHandler.damageEntity(le, this.speed / 2, this); DamageHandler.damageEntity(le, this.speed / 2, this);
le.setVelocity(this.player.getVelocity().clone().multiply(2 / 3)); GeneralMethods.setVelocity(this, le, this.player.getVelocity().clone().multiply(2 / 3));
} }
} }
} }
} }
this.particles(); this.particles();
this.player.setVelocity(this.player.getEyeLocation().getDirection().clone().multiply(this.multiplier)); GeneralMethods.setVelocity(this, this.player, this.player.getEyeLocation().getDirection().clone().multiply(this.multiplier));
} else if (this.mode == FlightMode.GLIDE) { } else if (this.mode == FlightMode.GLIDE) {
this.player.setAllowFlight(false); this.player.setAllowFlight(false);
this.player.setFlying(false); this.player.setFlying(false);

32
src/com/projectkorra/projectkorra/attribute/AttributeModifier.java
View file

@ -3,46 +3,46 @@ package com.projectkorra.projectkorra.attribute;
public enum AttributeModifier { public enum AttributeModifier {
ADDITION((oldValue, modifier) -> { ADDITION((oldValue, modifier) -> {
if (oldValue instanceof Double || modifier instanceof Double) { if (oldValue instanceof Double) {
return oldValue.doubleValue() + modifier.doubleValue(); return oldValue.doubleValue() + modifier.doubleValue();
} else if (oldValue instanceof Float || modifier instanceof Float) { } else if (oldValue instanceof Float) {
return oldValue.floatValue() + modifier.floatValue(); return oldValue.floatValue() + modifier.floatValue();
} else if (oldValue instanceof Long || modifier instanceof Long) { } else if (oldValue instanceof Long) {
return oldValue.longValue() + modifier.longValue(); return oldValue.longValue() + modifier.longValue();
} else if (oldValue instanceof Integer || modifier instanceof Integer) { } else if (oldValue instanceof Integer) {
return oldValue.intValue() + modifier.intValue(); return oldValue.intValue() + modifier.intValue();
} }
return 0; return 0;
}), SUBTRACTION((oldValue, modifier) -> { }), SUBTRACTION((oldValue, modifier) -> {
if (oldValue instanceof Double || modifier instanceof Double) { if (oldValue instanceof Double) {
return oldValue.doubleValue() - modifier.doubleValue(); return oldValue.doubleValue() - modifier.doubleValue();
} else if (oldValue instanceof Float || modifier instanceof Float) { } else if (oldValue instanceof Float) {
return oldValue.floatValue() - modifier.floatValue(); return oldValue.floatValue() - modifier.floatValue();
} else if (oldValue instanceof Long || modifier instanceof Long) { } else if (oldValue instanceof Long) {
return oldValue.longValue() - modifier.longValue(); return oldValue.longValue() - modifier.longValue();
} else if (oldValue instanceof Integer || modifier instanceof Integer) { } else if (oldValue instanceof Integer) {
return oldValue.intValue() - modifier.intValue(); return oldValue.intValue() - modifier.intValue();
} }
return 0; return 0;
}), MULTIPLICATION((oldValue, modifier) -> { }), MULTIPLICATION((oldValue, modifier) -> {
if (oldValue instanceof Double || modifier instanceof Double) { if (oldValue instanceof Double) {
return oldValue.doubleValue() * modifier.doubleValue(); return oldValue.doubleValue() * modifier.doubleValue();
} else if (oldValue instanceof Float || modifier instanceof Float) { } else if (oldValue instanceof Float) {
return oldValue.floatValue() * modifier.floatValue(); return oldValue.floatValue() * modifier.floatValue();
} else if (oldValue instanceof Long || modifier instanceof Long) { } else if (oldValue instanceof Long) {
return oldValue.longValue() * modifier.longValue(); return oldValue.longValue() * modifier.longValue();
} else if (oldValue instanceof Integer || modifier instanceof Integer) { } else if (oldValue instanceof Integer) {
return oldValue.intValue() * modifier.intValue(); return oldValue.intValue() * modifier.intValue();
} }
return 0; return 0;
}), DIVISION((oldValue, modifier) -> { }), DIVISION((oldValue, modifier) -> {
if (oldValue instanceof Double || modifier instanceof Double) { if (oldValue instanceof Double) {
return oldValue.doubleValue() / modifier.doubleValue(); return oldValue.doubleValue() / modifier.doubleValue();
} else if (oldValue instanceof Float || modifier instanceof Float) { } else if (oldValue instanceof Float) {
return oldValue.floatValue() / modifier.floatValue(); return oldValue.floatValue() / modifier.floatValue();
} else if (oldValue instanceof Long || modifier instanceof Long) { } else if (oldValue instanceof Long) {
return oldValue.longValue() / modifier.longValue(); return oldValue.longValue() / modifier.longValue();
} else if (oldValue instanceof Integer || modifier instanceof Integer) { } else if (oldValue instanceof Integer) {
return oldValue.intValue() / modifier.intValue(); return oldValue.intValue() / modifier.intValue();
} }
return 0; return 0;

7
src/com/projectkorra/projectkorra/avatar/AvatarState.java
View file

@ -54,7 +54,6 @@ public class AvatarState extends AvatarAbility {
playAvatarSound(player.getLocation()); playAvatarSound(player.getLocation());
this.start(); this.start();
this.bPlayer.addCooldown(this, true);
if (this.duration != 0) { if (this.duration != 0) {
START_TIMES.put(player.getName(), System.currentTimeMillis()); START_TIMES.put(player.getName(), System.currentTimeMillis());
player.getUniqueId(); player.getUniqueId();
@ -79,6 +78,12 @@ public class AvatarState extends AvatarAbility {
this.addPotionEffects(); this.addPotionEffects();
} }
@Override
public void remove() {
this.bPlayer.addCooldown(this, true);
super.remove();
}
private void addPotionEffects() { private void addPotionEffects() {
if (this.regenEnabled) { if (this.regenEnabled) {
this.addProgressPotionEffect(PotionEffectType.REGENERATION, this.regenPower); this.addProgressPotionEffect(PotionEffectType.REGENERATION, this.regenPower);

130
src/com/projectkorra/projectkorra/board/BendingBoardInstance.java Executable file
View file

@ -0,0 +1,130 @@
package com.projectkorra.projectkorra.board;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Objective;
import org.bukkit.scoreboard.Scoreboard;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
* Represents a player's scoreboard for bending purposes
*/
public class BendingBoardInstance {
private final String[] cachedSlots = new String[10];
private final Set<String> misc = new HashSet<>(); // Stores scoreboard scores for combos and misc abilities
private final Player player;
private final BendingPlayer bendingPlayer;
private final Scoreboard bendingBoard;
private final Objective bendingSlots;
private int selectedSlot;
public BendingBoardInstance(final BendingPlayer bPlayer) {
bendingPlayer = bPlayer;
player = bPlayer.getPlayer();
selectedSlot = player.getInventory().getHeldItemSlot() + 1;
bendingBoard = Bukkit.getScoreboardManager().getNewScoreboard();
String title = ChatColor.translateAlternateColorCodes('&', ConfigManager.languageConfig.get().getString("Board.Title"));
bendingSlots = bendingBoard.registerNewObjective("Board Slots", "dummy", title);
bendingSlots.setDisplaySlot(DisplaySlot.SIDEBAR);
player.setScoreboard(bendingBoard);
Arrays.fill(cachedSlots, "");
updateAll();
}
public void disableScoreboard() {
bendingBoard.clearSlot(DisplaySlot.SIDEBAR);
bendingSlots.unregister();
player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
}
private void setSlot(int slot, String name, boolean cooldown) {
if (slot < 1 || slot > 9 || !player.getScoreboard().equals(bendingBoard)) return;
String prefix = ChatColor.translateAlternateColorCodes('&', ConfigManager.languageConfig.get().getString("Board.SelectionPrefix"));
StringBuilder sb = new StringBuilder(slot == selectedSlot ? prefix : String.join("", Collections.nCopies(ChatColor.stripColor(prefix).length(), " ")));
if (name == null || name.isEmpty()) {
String emptySlot = ChatColor.translateAlternateColorCodes('&', ConfigManager.languageConfig.get().getString("Board.EmptySlot").replaceAll("\\{slot_number\\}", "" + slot));
sb.append(emptySlot);
} else {
CoreAbility coreAbility = CoreAbility.getAbility(ChatColor.stripColor(name));
if (coreAbility == null) { // MultiAbility
if (cooldown || bendingPlayer.isOnCooldown(name)) sb.append(ChatColor.STRIKETHROUGH);
sb.append(name);
} else {
sb.append(coreAbility.getMovePreviewWithoutCooldownTimer(player, cooldown));
}
}
sb.append(ChatColor.values()[slot].toString()); // Unique suffix
if (!cachedSlots[slot].equals(sb.toString())) {
bendingBoard.resetScores(cachedSlots[slot]);
}
cachedSlots[slot] = sb.toString();
bendingSlots.getScore(sb.toString()).setScore(-slot);
}
public void updateAll() {
final Map<Integer, String> boundAbilities = new HashMap<>(bendingPlayer.getAbilities());
for (int i = 1; i <= 9; i++) {
setSlot(i, boundAbilities.getOrDefault(i, ""), false);
}
}
public void clearSlot(int slot) {
setSlot(slot, null, false);
}
public void setActiveSlot(int oldSlot, int newSlot) {
if (selectedSlot != oldSlot) {
oldSlot = selectedSlot; // Fixes bug when slot is set using setHeldItemSlot
}
selectedSlot = newSlot;
setSlot(oldSlot, bendingPlayer.getAbilities().getOrDefault(oldSlot, ""), false);
setSlot(newSlot, bendingPlayer.getAbilities().getOrDefault(newSlot, ""), false);
}
public void setAbility(String name, boolean cooldown) {
final Map<Integer, String> boundAbilities = bendingPlayer.getAbilities();
boundAbilities.keySet().stream().filter(key -> name.equals(boundAbilities.get(key))).forEach(slot -> setSlot(slot, name, cooldown));
}
public void updateMisc(String text, boolean show, boolean isCombo) {
String selection = ChatColor.translateAlternateColorCodes('&', ConfigManager.languageConfig.get().getString("Board.SelectionPrefix"));
String prefix = String.join("", Collections.nCopies(ChatColor.stripColor(selection).length(), " "));
String miscSeparator = ChatColor.translateAlternateColorCodes('&', ConfigManager.languageConfig.get().getString("Board.MiscSeparator"));
String alignedText = prefix + text;
if (show) {
if (misc.isEmpty()) {
bendingSlots.getScore(miscSeparator).setScore(-10);
}
misc.add(alignedText);
bendingSlots.getScore(alignedText).setScore(isCombo ? -11 : -12);
} else {
misc.remove(alignedText);
bendingBoard.resetScores(alignedText);
if (misc.isEmpty()) {
bendingBoard.resetScores(miscSeparator);
}
}
}
}

200
src/com/projectkorra/projectkorra/board/BendingBoardManager.java Executable file
View file

@ -0,0 +1,200 @@
package com.projectkorra.projectkorra.board;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.storage.DBConnection;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
/**
* Manages every individual {@link BendingBoardInstance}
*/
public class BendingBoardManager {
private static final Set<String> disabledWorlds = new HashSet<>();
private static final Map<String, ChatColor> trackedCooldowns = new ConcurrentHashMap<>();
private static final Set<UUID> disabledPlayers = Collections.synchronizedSet(new HashSet<>());
private static final Map<Player, BendingBoardInstance> scoreboardPlayers = new ConcurrentHashMap<>();
private static boolean enabled;
public static void setup() {
initialize(true);
Bukkit.getOnlinePlayers().forEach(BendingBoardManager::canUseScoreboard);
}
public static void reload() {
scoreboardPlayers.values().forEach(BendingBoardInstance::disableScoreboard);
scoreboardPlayers.clear();
initialize(false);
}
private static void initialize(boolean initial) {
if (initial) loadDisabledPlayers();
enabled = ConfigManager.getConfig().getBoolean("Properties.BendingBoard");
disabledWorlds.clear();
disabledWorlds.addAll(ConfigManager.getConfig().getStringList("Properties.DisabledWorlds"));
}
/**
* Force toggle the scoreboard for when a player changes worlds (for example when teleporting to a world where bending is disabled)
* @param player
*/
public static void forceToggleScoreboard(Player player) {
if (disabledWorlds.contains(player.getWorld().getName())) {
if (scoreboardPlayers.containsKey(player)) {
scoreboardPlayers.get(player).disableScoreboard();
scoreboardPlayers.remove(player);
}
} else {
canUseScoreboard(player);
}
}
public static void toggleScoreboard(Player player) {
if (!enabled || disabledWorlds.contains(player.getWorld().getName())) {
GeneralMethods.sendBrandingMessage(player, ChatColor.RED + ConfigManager.languageConfig.get().getString("Commands.Board.Disabled"));
return;
}
if (scoreboardPlayers.containsKey(player)) {
scoreboardPlayers.get(player).disableScoreboard();
disabledPlayers.add(player.getUniqueId());
scoreboardPlayers.remove(player);
GeneralMethods.sendBrandingMessage(player, ChatColor.RED + ConfigManager.languageConfig.get().getString("Commands.Board.ToggledOff"));
} else {
disabledPlayers.remove(player.getUniqueId());
canUseScoreboard(player);
GeneralMethods.sendBrandingMessage(player, ChatColor.GREEN + ConfigManager.languageConfig.get().getString("Commands.Board.ToggledOn"));
}
}
/**
* Checks if a player can use the bending board and creates a BendingBoardInstance if possible.
* @param player the player to check
* @return true if player can use the bending board, false otherwise
*/
public static boolean canUseScoreboard(Player player) {
if (!enabled || disabledPlayers.contains(player.getUniqueId()) || disabledWorlds.contains(player.getWorld().getName())) {
return false;
}
if (!player.isOnline()) {
return false;
}
if (!scoreboardPlayers.containsKey(player)) {
BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
if (bPlayer == null) {
return false;
}
scoreboardPlayers.put(player, new BendingBoardInstance(bPlayer));
}
return true;
}
public static void updateAllSlots(Player player) {
if (canUseScoreboard(player)) {
scoreboardPlayers.get(player).updateAll();
}
}
public static void updateBoard(Player player, String abilityName, boolean cooldown, int slot) {
if (canUseScoreboard(player)) {
if (abilityName == null || abilityName.isEmpty()) {
scoreboardPlayers.get(player).clearSlot(slot);
return;
}
if (MultiAbilityManager.hasMultiAbilityBound(player)) {
scoreboardPlayers.get(player).updateAll();
return;
}
CoreAbility coreAbility = CoreAbility.getAbility(abilityName);
if (coreAbility != null && ComboManager.getComboAbilities().containsKey(abilityName)) {
scoreboardPlayers.get(player).updateMisc("" + coreAbility.getElement().getColor() + ChatColor.STRIKETHROUGH + abilityName, cooldown, true);
return;
} else if (coreAbility == null && trackedCooldowns.containsKey(abilityName)) {
scoreboardPlayers.get(player).updateMisc("" + trackedCooldowns.get(abilityName) + ChatColor.STRIKETHROUGH + abilityName, cooldown, false);
return;
}
scoreboardPlayers.get(player).setAbility(abilityName, cooldown);
}
}
public static void changeActiveSlot(Player player, int oldSlot, int newSlot) {
if (canUseScoreboard(player)) {
scoreboardPlayers.get(player).setActiveSlot(++oldSlot, ++newSlot);
}
}
/**
* Some abilities use internal cooldowns with custom names that don't correspond to bound abilities' names.
* Adds the internal cooldown name and color to the map of tracked abilities so as they can appear on the bending board.
* @param cooldownName the internal cooldown name
* @param color the color to use when rendering the board entry
*/
public static void addCooldownToTrack(String cooldownName, ChatColor color) {
trackedCooldowns.put(cooldownName, color);
}
/**
* Load into memory the list of players who have toggled the bending board off.
*/
public static void loadDisabledPlayers() {
Bukkit.getScheduler().runTaskAsynchronously(ProjectKorra.plugin, () -> {
Set<UUID> disabled = new HashSet<>();
try {
final ResultSet rs = DBConnection.sql.readQuery("SELECT uuid FROM pk_board where enabled = 0");
while (rs.next()) disabled.add(UUID.fromString(rs.getString("uuid")));
} catch (SQLException e) {
e.printStackTrace();
}
disabledPlayers.clear();
disabledPlayers.addAll(disabled);
});
}
/**
* Called on player logout
* Removes the board instance and stores the player's toggle preference for the bending board in the database
* @param player
*/
public static void clean(final Player player) {
scoreboardPlayers.remove(player);
final UUID uuid = player.getUniqueId();
final String updateQuery = "UPDATE pk_board SET enabled = " + (disabledPlayers.contains(uuid) ? 0 : 1) + " WHERE uuid = ?";
Bukkit.getScheduler().runTaskAsynchronously(ProjectKorra.plugin, () -> {
try {
PreparedStatement ps = DBConnection.sql.getConnection().prepareStatement("SELECT enabled FROM pk_board where uuid = ? LIMIT 1");
ps.setString(1, uuid.toString());
PreparedStatement ps2;
if (!ps.executeQuery().next()) { // if the entry doesn't exist in the DB, create it.
ps2 = DBConnection.sql.getConnection().prepareStatement("INSERT INTO pk_board (uuid, enabled) VALUES (?, 1)");
} else { // if the entry exists in the DB, update it
ps2 = DBConnection.sql.getConnection().prepareStatement(updateQuery);
}
ps2.setString(1, uuid.toString());
ps2.execute();
} catch (SQLException e) {
e.printStackTrace();
}
});
}
}

3
src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
View file

@ -7,7 +7,6 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.Element; import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility; import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute; import com.projectkorra.projectkorra.attribute.Attribute;
@ -48,7 +47,6 @@ public class AcrobatStance extends ChiAbility {
} }
this.start(); this.start();
this.bPlayer.setStance(this); this.bPlayer.setStance(this);
GeneralMethods.displayMovePreview(player);
player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_HURT, 0.5F, 2F); player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_HURT, 0.5F, 2F);
} }
@ -75,7 +73,6 @@ public class AcrobatStance extends ChiAbility {
super.remove(); super.remove();
this.bPlayer.addCooldown(this); this.bPlayer.addCooldown(this);
this.bPlayer.setStance(null); this.bPlayer.setStance(null);
GeneralMethods.displayMovePreview(this.player);
this.player.playSound(this.player.getLocation(), Sound.ENTITY_ENDER_DRAGON_SHOOT, 0.5F, 2F); this.player.playSound(this.player.getLocation(), Sound.ENTITY_ENDER_DRAGON_SHOOT, 0.5F, 2F);
this.player.removePotionEffect(PotionEffectType.SPEED); this.player.removePotionEffect(PotionEffectType.SPEED);
this.player.removePotionEffect(PotionEffectType.JUMP); this.player.removePotionEffect(PotionEffectType.JUMP);

2
src/com/projectkorra/projectkorra/chiblocking/HighJump.java
View file

@ -35,7 +35,7 @@ public class HighJump extends ChiAbility {
} }
final Vector vec = p.getVelocity(); final Vector vec = p.getVelocity();
vec.setY(this.height); vec.setY(this.height);
p.setVelocity(vec); GeneralMethods.setVelocity(this, p, vec);
this.bPlayer.addCooldown(this); this.bPlayer.addCooldown(this);
return; return;
} }

3
src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
View file

@ -7,7 +7,6 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.Element; import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility; import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute; import com.projectkorra.projectkorra.attribute.Attribute;
@ -42,7 +41,6 @@ public class WarriorStance extends ChiAbility {
} }
this.start(); this.start();
this.bPlayer.setStance(this); this.bPlayer.setStance(this);
GeneralMethods.displayMovePreview(player);
player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_HURT, 0.5F, 2F); player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_HURT, 0.5F, 2F);
} }
@ -70,7 +68,6 @@ public class WarriorStance extends ChiAbility {
this.bPlayer.addCooldown(this); this.bPlayer.addCooldown(this);
this.bPlayer.setStance(null); this.bPlayer.setStance(null);
if (this.player != null) { if (this.player != null) {
GeneralMethods.displayMovePreview(this.player);
this.player.playSound(this.player.getLocation(), Sound.ENTITY_ENDER_DRAGON_SHOOT, 0.5F, 2F); this.player.playSound(this.player.getLocation(), Sound.ENTITY_ENDER_DRAGON_SHOOT, 0.5F, 2F);
this.player.removePotionEffect(PotionEffectType.DAMAGE_RESISTANCE); this.player.removePotionEffect(PotionEffectType.DAMAGE_RESISTANCE);
this.player.removePotionEffect(PotionEffectType.INCREASE_DAMAGE); this.player.removePotionEffect(PotionEffectType.INCREASE_DAMAGE);

27
src/com/projectkorra/projectkorra/command/BoardCommand.java Executable file
View file

@ -0,0 +1,27 @@
package com.projectkorra.projectkorra.command;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.board.BendingBoardManager;
import com.projectkorra.projectkorra.configuration.ConfigManager;
/**
* Executor for /bending board. Extends {@link PKCommand}.
*/
public class BoardCommand extends PKCommand {
public BoardCommand() {
super("board", "/bending board", ConfigManager.languageConfig.get().getString("Commands.Board.Description"), new String[]{ "bendingboard", "board", "bb" });
}
@Override
public void execute(final CommandSender sender, final List<String> args) {
if (!this.hasPermission(sender) || !this.isPlayer(sender) || !this.correctLength(sender, args.size(), 0, 0)) {
return;
}
BendingBoardManager.toggleScoreboard((Player) sender);
}
}

7
src/com/projectkorra/projectkorra/command/ChooseCommand.java
View file

@ -170,7 +170,8 @@ public class ChooseCommand extends PKCommand {
GeneralMethods.sendBrandingMessage(target, color + this.chosenCFW.replace("{element}", sub.getName() + sub.getType().getBender())); GeneralMethods.sendBrandingMessage(target, color + this.chosenCFW.replace("{element}", sub.getName() + sub.getType().getBender()));
} }
GeneralMethods.saveSubElements(bPlayer); GeneralMethods.saveSubElements(bPlayer);
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeSubElementEvent(sender, target, sub, com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent.Result.CHOOSE)); GeneralMethods.removeUnusableAbilities(target.getName());
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeSubElementEvent(sender, target, sub, PlayerChangeSubElementEvent.Result.CHOOSE));
} else { } else {
bPlayer.setElement(element); bPlayer.setElement(element);
bPlayer.getSubElements().clear(); bPlayer.getSubElements().clear();
@ -196,11 +197,9 @@ public class ChooseCommand extends PKCommand {
} }
GeneralMethods.saveElements(bPlayer); GeneralMethods.saveElements(bPlayer);
GeneralMethods.saveSubElements(bPlayer); GeneralMethods.saveSubElements(bPlayer);
GeneralMethods.removeUnusableAbilities(target.getName());
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, element, Result.CHOOSE)); Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, element, Result.CHOOSE));
} }
GeneralMethods.removeUnusableAbilities(target.getName());
} }
public static boolean isVowel(final char c) { public static boolean isVowel(final char c) {

1
src/com/projectkorra/projectkorra/command/Commands.java
View file

@ -80,6 +80,7 @@ public class Commands {
new AddCommand(); new AddCommand();
new BindCommand(); new BindCommand();
new CheckCommand(); new CheckCommand();
new BoardCommand();
new ChooseCommand(); new ChooseCommand();
new ClearCommand(); new ClearCommand();
new CopyCommand(); new CopyCommand();

2
src/com/projectkorra/projectkorra/command/CopyCommand.java
View file

@ -13,6 +13,7 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods; import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra; import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility; import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.board.BendingBoardManager;
import com.projectkorra.projectkorra.configuration.ConfigManager; import com.projectkorra.projectkorra.configuration.ConfigManager;
public class CopyCommand extends PKCommand { public class CopyCommand extends PKCommand {
@ -107,6 +108,7 @@ public class CopyCommand extends PKCommand {
} }
} }
target.setAbilities(abilities); target.setAbilities(abilities);
BendingBoardManager.updateAllSlots(player2);
return boundAll; return boundAll;
} }

23
src/com/projectkorra/projectkorra/command/DisplayCommand.java
View file

@ -96,9 +96,11 @@ public class DisplayCommand extends PKCommand {
} }
final CoreAbility coreAbil = CoreAbility.getAbility(comboAbil); final CoreAbility coreAbil = CoreAbility.getAbility(comboAbil);
if (coreAbil != null) { if (coreAbil == null || coreAbil.isHiddenAbility()) {
comboColor = coreAbil.getElement().getColor(); continue;
} }
comboColor = coreAbil.getElement().getColor();
String message = (comboColor + comboAbil); String message = (comboColor + comboAbil);
if (coreAbil instanceof AddonAbility) { if (coreAbil instanceof AddonAbility) {
@ -127,9 +129,10 @@ public class DisplayCommand extends PKCommand {
} }
final CoreAbility coreAbil = CoreAbility.getAbility(comboMove); final CoreAbility coreAbil = CoreAbility.getAbility(comboMove);
if (coreAbil != null) { if (coreAbil == null || coreAbil.isHiddenAbility()) {
comboColor = coreAbil.getElement().getColor(); continue;
} }
comboColor = coreAbil.getElement().getColor();
String message = (comboColor + comboMove); String message = (comboColor + comboMove);
@ -157,9 +160,11 @@ public class DisplayCommand extends PKCommand {
} }
final CoreAbility coreAbil = CoreAbility.getAbility(passiveAbil); final CoreAbility coreAbil = CoreAbility.getAbility(passiveAbil);
if (coreAbil != null) { if (coreAbil == null || coreAbil.isHiddenAbility()) {
passiveColor = coreAbil.getElement().getColor(); continue;
} }
passiveColor = coreAbil.getElement().getColor();
String message = (passiveColor + passiveAbil); String message = (passiveColor + passiveAbil);
if (coreAbil instanceof AddonAbility) { if (coreAbil instanceof AddonAbility) {
@ -188,9 +193,11 @@ public class DisplayCommand extends PKCommand {
} }
final CoreAbility coreAbil = CoreAbility.getAbility(passiveAbil); final CoreAbility coreAbil = CoreAbility.getAbility(passiveAbil);
if (coreAbil != null) { if (coreAbil == null || coreAbil.isHiddenAbility()) {
passiveColor = coreAbil.getElement().getColor(); continue;
} }
passiveColor = coreAbil.getElement().getColor();
sender.sendMessage(passiveColor + passiveAbil); sender.sendMessage(passiveColor + passiveAbil);
} }
return; return;

6
src/com/projectkorra/projectkorra/command/PresetCommand.java
View file

@ -132,7 +132,11 @@ public class PresetCommand extends PKCommand {
} else if (Arrays.asList(bindaliases).contains(args.get(0)) && this.hasPermission(sender, "bind")) { // bending preset bind name. } else if (Arrays.asList(bindaliases).contains(args.get(0)) && this.hasPermission(sender, "bind")) { // bending preset bind name.
if (args.size() < 3) { if (args.size() < 3) {
boolean boundAll = false; boolean boundAll = false;
if (Preset.presetExists(player, name)) {
if (name == null) {
GeneralMethods.sendBrandingMessage(sender, ChatColor.RED + this.invalidName);
return;
} else if (Preset.presetExists(player, name)) {
final Preset preset = Preset.getPreset(player, name); final Preset preset = Preset.getPreset(player, name);
GeneralMethods.sendBrandingMessage(sender, ChatColor.GREEN + this.bound.replace("{name}", ChatColor.YELLOW + preset.getName() + ChatColor.GREEN)); GeneralMethods.sendBrandingMessage(sender, ChatColor.GREEN + this.bound.replace("{name}", ChatColor.YELLOW + preset.getName() + ChatColor.GREEN));

13
src/com/projectkorra/projectkorra/command/WhoCommand.java
View file

@ -94,6 +94,10 @@ public class WhoCommand extends PKCommand {
} }
final List<String> players = new ArrayList<String>(); final List<String> players = new ArrayList<String>();
for (final Player player : Bukkit.getOnlinePlayers()) { for (final Player player : Bukkit.getOnlinePlayers()) {
if (sender instanceof Player && !((Player) sender).canSee(player)) {
continue;
}
final String playerName = player.getName(); final String playerName = player.getName();
String result = ""; String result = "";
BendingPlayer bp = BendingPlayer.getBendingPlayer(playerName); BendingPlayer bp = BendingPlayer.getBendingPlayer(playerName);
@ -150,12 +154,13 @@ public class WhoCommand extends PKCommand {
GeneralMethods.sendBrandingMessage(sender, ChatColor.RED + "Player not found!"); GeneralMethods.sendBrandingMessage(sender, ChatColor.RED + "Player not found!");
return; return;
} }
if (!player.isOnline() && !BendingPlayer.getPlayers().containsKey(player.getUniqueId())) {
GeneralMethods.sendBrandingMessage(sender, ChatColor.GRAY + this.playerOffline.replace("{player}", ChatColor.WHITE + player.getName() + ChatColor.GRAY).replace("{target}", ChatColor.WHITE + player.getName() + ChatColor.GRAY));
}
final Player player_ = (Player) (player.isOnline() ? player : null); final Player player_ = (Player) (player.isOnline() ? player : null);
BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
if ((!player.isOnline() && !BendingPlayer.getPlayers().containsKey(player.getUniqueId())) || (sender instanceof Player && player_ != null && !((Player) sender).canSee(player_))) {
GeneralMethods.sendBrandingMessage(sender, ChatColor.GRAY + this.playerOffline.replace("{player}", ChatColor.WHITE + player.getName() + ChatColor.GRAY).replace("{target}", ChatColor.WHITE + player.getName() + ChatColor.GRAY));
}
if (bPlayer == null) { if (bPlayer == null) {
GeneralMethods.createBendingPlayer(player.getUniqueId(), playerName); GeneralMethods.createBendingPlayer(player.getUniqueId(), playerName);

28
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -43,11 +43,6 @@ public class ConfigManager {
} else if (type == ConfigType.LANGUAGE) { } else if (type == ConfigType.LANGUAGE) {
config = languageConfig.get(); config = languageConfig.get();
final ArrayList<String> helpLines = new ArrayList<String>();
helpLines.add("&c/bending help [Ability/Command] &eDisplay help.");
helpLines.add("&c/bending choose [Element] &eChoose an element.");
helpLines.add("&c/bending bind [Ability] # &eBind an ability.");
config.addDefault("Chat.Enable", true); config.addDefault("Chat.Enable", true);
config.addDefault("Chat.Format", "<name>: <message>"); config.addDefault("Chat.Format", "<name>: <message>");
config.addDefault("Chat.Colors.Avatar", "DARK_PURPLE"); config.addDefault("Chat.Colors.Avatar", "DARK_PURPLE");
@ -77,6 +72,11 @@ public class ConfigManager {
config.addDefault("Chat.Prefixes.Avatar", "[Avatar]"); config.addDefault("Chat.Prefixes.Avatar", "[Avatar]");
config.addDefault("Chat.Prefixes.Nonbender", "[Nonbender]"); config.addDefault("Chat.Prefixes.Nonbender", "[Nonbender]");
config.addDefault("Board.Title", "&lAbilities");
config.addDefault("Board.SelectionPrefix", "> &r");
config.addDefault("Board.EmptySlot", "&8-- Slot {slot_number} --");
config.addDefault("Board.MiscSeparator", " ------------");
config.addDefault("Extras.Water.NightMessage", "Your waterbending has become empowered due to the moon rising."); config.addDefault("Extras.Water.NightMessage", "Your waterbending has become empowered due to the moon rising.");
config.addDefault("Extras.Water.DayMessage", "You feel the empowering of your waterbending subside as the moon sets."); config.addDefault("Extras.Water.DayMessage", "You feel the empowering of your waterbending subside as the moon sets.");
config.addDefault("Extras.Fire.NightMessage", "You feel the empowering of your firebending subside as the sun sets."); config.addDefault("Extras.Fire.NightMessage", "You feel the empowering of your firebending subside as the sun sets.");
@ -180,6 +180,11 @@ public class ConfigManager {
config.addDefault("Commands.Debug.Description", "Outputs information on the current ProjectKorra installation to /plugins/ProjectKorra/debug.txt"); config.addDefault("Commands.Debug.Description", "Outputs information on the current ProjectKorra installation to /plugins/ProjectKorra/debug.txt");
config.addDefault("Commands.Debug.SuccessfullyExported", "Debug File Created as debug.txt in the ProjectKorra plugin folder.\nPut contents on pastie.org and create a bug report on the ProjectKorra forum if you need to."); config.addDefault("Commands.Debug.SuccessfullyExported", "Debug File Created as debug.txt in the ProjectKorra plugin folder.\nPut contents on pastie.org and create a bug report on the ProjectKorra forum if you need to.");
config.addDefault("Commands.Board.Description", "Toggle bending board visibility.");
config.addDefault("Commands.Board.Disabled", "Bending board is disabled.");
config.addDefault("Commands.Board.ToggledOn", "You have made your bending board visible again.");
config.addDefault("Commands.Board.ToggledOff", "You have hidden your bending board.");
config.addDefault("Commands.Copy.Description", "This command will allow the user to copy the binds of another player either for himself or assign them to <Player> if specified."); config.addDefault("Commands.Copy.Description", "This command will allow the user to copy the binds of another player either for himself or assign them to <Player> if specified.");
config.addDefault("Commands.Copy.PlayerNotFound", "Couldn't find player."); config.addDefault("Commands.Copy.PlayerNotFound", "Couldn't find player.");
config.addDefault("Commands.Copy.SuccessfullyCopied", "Your binds have been set to match {target}'s!"); config.addDefault("Commands.Copy.SuccessfullyCopied", "Your binds have been set to match {target}'s!");
@ -252,7 +257,7 @@ public class ConfigManager {
config.addDefault("Abilities.Air.AirScooter.Instructions", "Sprint, jump, and left click while in the air to activate air scooter. You will then move forward in the direction you're looking."); config.addDefault("Abilities.Air.AirScooter.Instructions", "Sprint, jump, and left click while in the air to activate air scooter. You will then move forward in the direction you're looking.");
config.addDefault("Abilities.Air.Tornado.Description", "Tornado is one of the most powerful and advanced abilities that an Airbender knows. If the tornado meets a player or mob, it will push them around. Tornado can also be used to push back projectiles and used for mobility. Use a tornado directly under you to propel yourself upwards."); config.addDefault("Abilities.Air.Tornado.Description", "Tornado is one of the most powerful and advanced abilities that an Airbender knows. If the tornado meets a player or mob, it will push them around. Tornado can also be used to push back projectiles and used for mobility. Use a tornado directly under you to propel yourself upwards.");
config.addDefault("Abilities.Air.Tornado.Instructions", "Hold sneak and a tornado will form gradually wherever you look."); config.addDefault("Abilities.Air.Tornado.Instructions", "Hold sneak and a tornado will form gradually wherever you look.");
config.addDefault("Abilities.Air.AirShield.Description", "Air Shield is one of the most powerful defensive techniques in existence. This ability is mainly used when you are low health and need protection. It's also useful when you're surrounded by mobs."); config.addDefault("Abilities.Air.AirShield.Description", "AirShield is one of the most powerful defensive techniques in existence. This ability is mainly used when you are low health and need protection. It's also useful when you're surrounded by mobs.");
config.addDefault("Abilities.Air.AirShield.Instructions", "Hold sneak and a shield of air will form around you, blocking projectiles and pushing entities back."); config.addDefault("Abilities.Air.AirShield.Instructions", "Hold sneak and a shield of air will form around you, blocking projectiles and pushing entities back.");
config.addDefault("Abilities.Air.AirSpout.Description", "This ability gives the airbender limited sustained levitation. It allows an airbender to gain a height advantage to escape from mobs, players or just to dodge from attacks. This ability is also useful for building as it allows you to reach great heights."); config.addDefault("Abilities.Air.AirSpout.Description", "This ability gives the airbender limited sustained levitation. It allows an airbender to gain a height advantage to escape from mobs, players or just to dodge from attacks. This ability is also useful for building as it allows you to reach great heights.");
config.addDefault("Abilities.Air.AirSpout.Instructions", "Left click to activate a spout beneath you and hold spacebar to go higher. If you wish to go lower, simply hold sneak. To disable this ability, left click once again."); config.addDefault("Abilities.Air.AirSpout.Instructions", "Left click to activate a spout beneath you and hold spacebar to go higher. If you wish to go lower, simply hold sneak. To disable this ability, left click once again.");
@ -357,7 +362,7 @@ public class ConfigManager {
config.addDefault("Abilities.Earth.Tremorsense.Description", "This is a pure utility ability for earthbenders. If you are in an area of low-light and are standing on top of an earthbendable block, this ability will automatically turn that block into glowstone, visible *only by you*. If you lose contact with a bendable block, the light will go out as you have lost contact with the earth and cannot 'see' until you can touch earth again. Additionally, if you click with this ability selected, smoke will appear above nearby earth with pockets of air beneath them."); config.addDefault("Abilities.Earth.Tremorsense.Description", "This is a pure utility ability for earthbenders. If you are in an area of low-light and are standing on top of an earthbendable block, this ability will automatically turn that block into glowstone, visible *only by you*. If you lose contact with a bendable block, the light will go out as you have lost contact with the earth and cannot 'see' until you can touch earth again. Additionally, if you click with this ability selected, smoke will appear above nearby earth with pockets of air beneath them.");
config.addDefault("Abilities.Earth.Tremorsense.Instructions", "Simply left click while on an earthbendable block."); config.addDefault("Abilities.Earth.Tremorsense.Instructions", "Simply left click while on an earthbendable block.");
config.addDefault("Abilities.Earth.Combo.EarthDome.Description", "EarthDome allows earthbenders to surround themselves or another entity in earth, temporarily preventing anything from entering or escaping the dome."); config.addDefault("Abilities.Earth.Combo.EarthDome.Description", "EarthDome allows earthbenders to surround themselves or another entity in earth, temporarily preventing anything from entering or escaping the dome.");
config.addDefault("Abilities.Earth.Combo.EarthDome.Instructions", "(Self) RaiseEarth (Right click) > Shockwave (Right click)\\n(Projection) RaiseEarth(Right click) > Shockwave (Left click)"); config.addDefault("Abilities.Earth.Combo.EarthDome.Instructions", "(Self) RaiseEarth (Right click) > Shockwave (Right click)" + "\n" + "(Projection) RaiseEarth (Right click) > Shockwave (Left click)");
config.addDefault("Abilities.Earth.Combo.EarthPillars.Description", "Send players and entities flying into the air and possibly stunning them by raising pillars of earth under their feet, dealing damage initally as well. This combo can also be used by falling from high off the ground and landing while on the Catapult ability"); config.addDefault("Abilities.Earth.Combo.EarthPillars.Description", "Send players and entities flying into the air and possibly stunning them by raising pillars of earth under their feet, dealing damage initally as well. This combo can also be used by falling from high off the ground and landing while on the Catapult ability");
config.addDefault("Abilities.Earth.Combo.EarthPillars.Instructions", "Shockwave (Tap sneak) > Shockwave (Hold sneak) > Catapult (Release sneak)"); config.addDefault("Abilities.Earth.Combo.EarthPillars.Instructions", "Shockwave (Tap sneak) > Shockwave (Hold sneak) > Catapult (Release sneak)");
config.addDefault("Abilities.Earth.Passive.DensityShift.Description", "DensityShift is a passive ability which allows earthbenders to make a firm landing negating all fall damage on any earthbendable surface."); config.addDefault("Abilities.Earth.Passive.DensityShift.Description", "DensityShift is a passive ability which allows earthbenders to make a firm landing negating all fall damage on any earthbendable surface.");
@ -555,6 +560,7 @@ public class ConfigManager {
config.addDefault("Properties.UpdateChecker", true); config.addDefault("Properties.UpdateChecker", true);
config.addDefault("Properties.Statistics", true); config.addDefault("Properties.Statistics", true);
config.addDefault("Properties.DatabaseCooldowns", true); config.addDefault("Properties.DatabaseCooldowns", true);
config.addDefault("Properties.BendingBoard", true);
config.addDefault("Properties.BendingPreview", true); config.addDefault("Properties.BendingPreview", true);
config.addDefault("Properties.BendingAffectFallingSand.Normal", true); config.addDefault("Properties.BendingAffectFallingSand.Normal", true);
config.addDefault("Properties.BendingAffectFallingSand.NormalStrengthMultiplier", 1.0); config.addDefault("Properties.BendingAffectFallingSand.NormalStrengthMultiplier", 1.0);
@ -580,7 +586,8 @@ public class ConfigManager {
config.addDefault("Properties.RegionProtection.RespectLWC", true); config.addDefault("Properties.RegionProtection.RespectLWC", true);
config.addDefault("Properties.RegionProtection.Residence.Flag", "bending"); config.addDefault("Properties.RegionProtection.Residence.Flag", "bending");
config.addDefault("Properties.RegionProtection.Residence.Respect", true); config.addDefault("Properties.RegionProtection.Residence.Respect", true);
config.addDefault("Properties.RegionProtection.RespectKingdoms", true); config.addDefault("Properties.RegionProtection.Kingdoms.Respect", true);
config.addDefault("Properties.RegionProtection.Kingdoms.ProtectDuringInvasions", false);
config.addDefault("Properties.RegionProtection.RespectPlotSquared", true); config.addDefault("Properties.RegionProtection.RespectPlotSquared", true);
config.addDefault("Properties.RegionProtection.RespectRedProtect", true); config.addDefault("Properties.RegionProtection.RespectRedProtect", true);
config.addDefault("Properties.RegionProtection.CacheBlockTime", 5000); config.addDefault("Properties.RegionProtection.CacheBlockTime", 5000);
@ -652,7 +659,7 @@ public class ConfigManager {
config.addDefault("Properties.Fire.BlueFire.DamageFactor", 1.1); config.addDefault("Properties.Fire.BlueFire.DamageFactor", 1.1);
config.addDefault("Properties.Fire.BlueFire.CooldownFactor", .9); config.addDefault("Properties.Fire.BlueFire.CooldownFactor", .9);
config.addDefault("Properties.Fire.BlueFire.RangeFactor", 1.2); config.addDefault("Properties.Fire.BlueFire.RangeFactor", 1.2);
config.addDefault("Properties.Chi.CanBendWithWeapons", true); config.addDefault("Properties.Chi.CanBendWithWeapons", true);
final ArrayList<String> disabledWorlds = new ArrayList<String>(); final ArrayList<String> disabledWorlds = new ArrayList<String>();
@ -1283,6 +1290,8 @@ public class ConfigManager {
config.addDefault("Abilities.Earth.EarthSmash.Damage", 5); config.addDefault("Abilities.Earth.EarthSmash.Damage", 5);
config.addDefault("Abilities.Earth.EarthSmash.Knockback", 3.5); config.addDefault("Abilities.Earth.EarthSmash.Knockback", 3.5);
config.addDefault("Abilities.Earth.EarthSmash.Knockup", 0.15); config.addDefault("Abilities.Earth.EarthSmash.Knockup", 0.15);
config.addDefault("Abilities.Earth.EarthSmash.Lift.Knockup", 1.1);
config.addDefault("Abilities.Earth.EarthSmash.Lift.Range", 3.5);
config.addDefault("Abilities.Earth.EarthSmash.Flight.Enabled", true); config.addDefault("Abilities.Earth.EarthSmash.Flight.Enabled", true);
config.addDefault("Abilities.Earth.EarthSmash.Flight.Speed", 0.72); config.addDefault("Abilities.Earth.EarthSmash.Flight.Speed", 0.72);
config.addDefault("Abilities.Earth.EarthSmash.Flight.Duration", 3000); config.addDefault("Abilities.Earth.EarthSmash.Flight.Duration", 3000);
@ -1293,6 +1302,7 @@ public class ConfigManager {
config.addDefault("Abilities.Earth.EarthSmash.Grab.DetectionRadius", 2.5); config.addDefault("Abilities.Earth.EarthSmash.Grab.DetectionRadius", 2.5);
config.addDefault("Abilities.Earth.EarthSmash.Shoot.Range", 25); config.addDefault("Abilities.Earth.EarthSmash.Shoot.Range", 25);
config.addDefault("Abilities.Earth.EarthSmash.Shoot.AnimationInterval", 25); config.addDefault("Abilities.Earth.EarthSmash.Shoot.AnimationInterval", 25);
config.addDefault("Abilities.Earth.EarthSmash.Shoot.CollisionRadius", 2.5);
config.addDefault("Abilities.Earth.EarthSmash.RequiredBendableBlocks", 11); config.addDefault("Abilities.Earth.EarthSmash.RequiredBendableBlocks", 11);
config.addDefault("Abilities.Earth.EarthSmash.MaxBlocksToPassThrough", 3); config.addDefault("Abilities.Earth.EarthSmash.MaxBlocksToPassThrough", 3);
config.addDefault("Abilities.Earth.EarthSmash.LiftAnimationInterval", 30); config.addDefault("Abilities.Earth.EarthSmash.LiftAnimationInterval", 30);

4
src/com/projectkorra/projectkorra/earthbending/Catapult.java
View file

@ -73,7 +73,7 @@ public class Catapult extends EarthAbility {
if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) { if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
continue; continue;
} }
entity.setVelocity(apply); GeneralMethods.setVelocity(this, entity, apply);
} }
} }
this.moveEarth(this.origin.clone().subtract(direction), direction, 3, false); this.moveEarth(this.origin.clone().subtract(direction), direction, 3, false);
@ -135,7 +135,7 @@ public class Catapult extends EarthAbility {
final Location tar = this.origin.clone().add(direction.clone().normalize().multiply(this.stage + 0.5)); final Location tar = this.origin.clone().add(direction.clone().normalize().multiply(this.stage + 0.5));
this.target = tar; this.target = tar;
final Vector apply = this.target.clone().toVector().subtract(this.origin.clone().toVector()); final Vector apply = this.target.clone().toVector().subtract(this.origin.clone().toVector());
this.player.setVelocity(apply); GeneralMethods.setVelocity(this, this.player, apply);
this.moveEarth(apply, direction); this.moveEarth(apply, direction);
this.remove(); this.remove();
} }

16
src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
View file

@ -45,7 +45,7 @@ public class EarthArmor extends EarthAbility {
private Location legsBlockLocation; private Location legsBlockLocation;
private boolean active; private boolean active;
private PotionEffect oldAbsorbtion = null; private PotionEffect oldAbsorbtion = null;
private float goldHearts; private double goldHearts;
@Attribute("GoldHearts") @Attribute("GoldHearts")
private int maxGoldHearts; private int maxGoldHearts;
private TempArmor armor; private TempArmor armor;
@ -84,6 +84,10 @@ public class EarthArmor extends EarthAbility {
if (!this.moveBlocks()) { if (!this.moveBlocks()) {
return; return;
} }
if ((TempBlock.isTempBlock(oldHeadBlock) && !isBendableEarthTempBlock(oldHeadBlock))
|| (TempBlock.isTempBlock(oldLegsBlock) && !isBendableEarthTempBlock(oldLegsBlock))) {
return;
}
if (isEarthRevertOn()) { if (isEarthRevertOn()) {
addTempAirBlock(oldHeadBlock); addTempAirBlock(oldHeadBlock);
addTempAirBlock(oldLegsBlock); addTempAirBlock(oldLegsBlock);
@ -141,7 +145,7 @@ public class EarthArmor extends EarthAbility {
this.player.addPotionEffect(new PotionEffect(PotionEffectType.ABSORPTION, Integer.MAX_VALUE, level, true, false)); this.player.addPotionEffect(new PotionEffect(PotionEffectType.ABSORPTION, Integer.MAX_VALUE, level, true, false));
this.goldHearts = this.maxGoldHearts * 2; this.goldHearts = this.maxGoldHearts * 2;
GeneralMethods.setAbsorbationHealth(this.player, this.goldHearts); this.player.setAbsorptionAmount(this.goldHearts);
} }
private boolean inPosition() { private boolean inPosition() {
@ -245,7 +249,7 @@ public class EarthArmor extends EarthAbility {
if (this.formed) { if (this.formed) {
if (!this.player.hasPotionEffect(PotionEffectType.ABSORPTION)) { if (!this.player.hasPotionEffect(PotionEffectType.ABSORPTION)) {
this.player.addPotionEffect(new PotionEffect(PotionEffectType.ABSORPTION, Integer.MAX_VALUE, 1, true, false)); this.player.addPotionEffect(new PotionEffect(PotionEffectType.ABSORPTION, Integer.MAX_VALUE, 1, true, false));
GeneralMethods.setAbsorbationHealth(this.player, this.goldHearts); this.player.setAbsorptionAmount(this.goldHearts);
} }
if (!this.active) { if (!this.active) {
@ -297,7 +301,7 @@ public class EarthArmor extends EarthAbility {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
abil.goldHearts = GeneralMethods.getAbsorbationHealth(EarthArmor.this.player); abil.goldHearts = EarthArmor.this.player.getAbsorptionAmount();
if (abil.formed && abil.goldHearts < 0.9F) { if (abil.formed && abil.goldHearts < 0.9F) {
abil.bPlayer.addCooldown(abil); abil.bPlayer.addCooldown(abil);
@ -597,7 +601,7 @@ public class EarthArmor extends EarthAbility {
this.cooldown = cooldown; this.cooldown = cooldown;
} }
public float getGoldHearts() { public double getGoldHearts() {
return this.goldHearts; return this.goldHearts;
} }
@ -605,7 +609,7 @@ public class EarthArmor extends EarthAbility {
return this.maxGoldHearts; return this.maxGoldHearts;
} }
public void setGoldHearts(final float goldHearts) { public void setGoldHearts(final double goldHearts) {
this.goldHearts = goldHearts; this.goldHearts = goldHearts;
} }

4
src/com/projectkorra/projectkorra/earthbending/EarthBlast.java
View file

@ -156,7 +156,7 @@ public class EarthBlast extends EarthAbility {
final Block block = BlockSource.getEarthSourceBlock(this.player, this.range, ClickType.SHIFT_DOWN); final Block block = BlockSource.getEarthSourceBlock(this.player, this.range, ClickType.SHIFT_DOWN);
if (block == null || !this.isEarthbendable(block)) { if (block == null || !this.isEarthbendable(block)) {
return false; return false;
} else if (TempBlock.isTempBlock(block)) { } else if (TempBlock.isTempBlock(block) && !EarthAbility.isBendableEarthTempBlock(block)) {
return false; return false;
} }
@ -276,7 +276,7 @@ public class EarthBlast extends EarthAbility {
final Location location = this.player.getEyeLocation(); final Location location = this.player.getEyeLocation();
final Vector vector = location.getDirection(); final Vector vector = location.getDirection();
entity.setVelocity(vector.normalize().multiply(this.pushFactor)); GeneralMethods.setVelocity(this, entity, vector.normalize().multiply(this.pushFactor));
double damage = this.damage; double damage = this.damage;
if (isMetal(this.sourceBlock) && this.bPlayer.canMetalbend()) { if (isMetal(this.sourceBlock) && this.bPlayer.canMetalbend()) {

4
src/com/projectkorra/projectkorra/earthbending/EarthGrab.java
View file

@ -74,7 +74,7 @@ public class EarthGrab extends EarthAbility {
return; return;
} }
if (this.bPlayer.isOnCooldown(this)) { if (bPlayer != null && this.bPlayer.isOnCooldown(this)) { //bPlayer can be null if the ability is disabled. If it is, it just won't start()
return; return;
} }
@ -320,7 +320,7 @@ public class EarthGrab extends EarthAbility {
continue; continue;
} }
final Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN); final Block b = entity.getLocation().getBlock().getRelative(BlockFace.DOWN);
entity.setVelocity(GeneralMethods.getDirection(entity.getLocation(), this.player.getLocation()).normalize().multiply(this.dragSpeed)); GeneralMethods.setVelocity(this, entity, GeneralMethods.getDirection(entity.getLocation(), this.player.getLocation()).normalize().multiply(this.dragSpeed));
ParticleEffect.BLOCK_CRACK.display(entity.getLocation(), 2, 0, 0, 0, b.getBlockData()); ParticleEffect.BLOCK_CRACK.display(entity.getLocation(), 2, 0, 0, 0, b.getBlockData());
playEarthbendingSound(entity.getLocation()); playEarthbendingSound(entity.getLocation());
} }

1968
src/com/projectkorra/projectkorra/earthbending/EarthSmash.java
View file

File diff suppressed because it is too large Load diff

2
src/com/projectkorra/projectkorra/earthbending/RaiseEarth.java
View file

@ -102,7 +102,7 @@ public class RaiseEarth extends EarthAbility {
private boolean canInstantiate() { private boolean canInstantiate() {
for (final Block block : this.affectedBlocks.keySet()) { for (final Block block : this.affectedBlocks.keySet()) {
if (!this.isEarthbendable(block) || TempBlock.isTempBlock(block)) { if (!this.isEarthbendable(block) || (TempBlock.isTempBlock(block) && !EarthAbility.isBendableEarthTempBlock(block))) {
return false; return false;
} }
} }

2
src/com/projectkorra/projectkorra/earthbending/Ripple.java
View file

@ -285,7 +285,7 @@ public class Ripple extends EarthAbility {
final Vector vector = this.direction.clone(); final Vector vector = this.direction.clone();
vector.setY(.5); vector.setY(.5);
final double knock = this.bPlayer.isAvatarState() ? AvatarState.getValue(this.knockback) : this.knockback; final double knock = this.bPlayer.isAvatarState() ? AvatarState.getValue(this.knockback) : this.knockback;
entity.setVelocity(vector.clone().normalize().multiply(knock)); GeneralMethods.setVelocity(this, entity, vector.clone().normalize().multiply(knock));
AirAbility.breakBreathbendingHold(entity); AirAbility.breakBreathbendingHold(entity);
} }

3
src/com/projectkorra/projectkorra/earthbending/combo/EarthPillars.java
View file

@ -100,8 +100,7 @@ public class EarthPillars extends EarthAbility implements ComboAbility {
if (lent instanceof Player && !((Player) lent).isOnline()) { if (lent instanceof Player && !((Player) lent).isOnline()) {
continue; continue;
} }
GeneralMethods.setVelocity(this, lent, new Vector(0, this.knockup, 0));
lent.setVelocity(new Vector(0, this.knockup, 0));
} }
if (this.damaging) { if (this.damaging) {
DamageHandler.damageEntity(lent, this.damage, this); DamageHandler.damageEntity(lent, this.damage, this);

6
src/com/projectkorra/projectkorra/earthbending/lava/LavaSurge.java
View file

@ -236,7 +236,7 @@ public class LavaSurge extends LavaAbility {
x = (this.random.nextBoolean()) ? -x : x; x = (this.random.nextBoolean()) ? -x : x;
z = (this.random.nextBoolean()) ? -z : z; z = (this.random.nextBoolean()) ? -z : z;
fbs.setVelocity(this.direction.clone().add(new Vector(x, 0.2, z)).multiply(1.2)); GeneralMethods.setVelocity(this, fbs, this.direction.clone().add(new Vector(x, 0.2, z)).multiply(1.2));
fbs.setDropItem(false); fbs.setDropItem(false);
for (final Block b : this.fracture) { for (final Block b : this.fracture) {
@ -244,7 +244,7 @@ public class LavaSurge extends LavaAbility {
final FallingBlock fb = GeneralMethods.spawnFallingBlock(b.getLocation().add(new Vector(0, 1, 0)), Material.MAGMA_BLOCK, Material.MAGMA_BLOCK.createBlockData()); final FallingBlock fb = GeneralMethods.spawnFallingBlock(b.getLocation().add(new Vector(0, 1, 0)), Material.MAGMA_BLOCK, Material.MAGMA_BLOCK.createBlockData());
ALL_FALLING_BLOCKS.add(fb); ALL_FALLING_BLOCKS.add(fb);
this.fallingBlocks.add(fb); this.fallingBlocks.add(fb);
fb.setVelocity(this.direction.clone().add(new Vector(this.random.nextDouble() / 10, 0.1, this.random.nextDouble() / 10)).multiply(1.2)); GeneralMethods.setVelocity(this, fb, this.direction.clone().add(new Vector(this.random.nextDouble() / 10, 0.1, this.random.nextDouble() / 10)).multiply(1.2));
fb.setDropItem(false); fb.setDropItem(false);
} }
} }
@ -258,7 +258,7 @@ public class LavaSurge extends LavaAbility {
if (e.getEntityId() != this.player.getEntityId()) { if (e.getEntityId() != this.player.getEntityId()) {
DamageHandler.damageEntity(e, this.impactDamage, this); DamageHandler.damageEntity(e, this.impactDamage, this);
e.setFireTicks(100); e.setFireTicks(100);
GeneralMethods.setVelocity(e, this.direction.clone()); GeneralMethods.setVelocity(this, e, this.direction.clone());
} }
} }
} }

2
src/com/projectkorra/projectkorra/earthbending/lava/LavaSurgeWave.java
View file

@ -207,7 +207,7 @@ public class LavaSurgeWave extends LavaAbility {
if (knockback) { if (knockback) {
final Vector dir = direction.clone(); final Vector dir = direction.clone();
dir.setY(dir.getY() * this.verticalPush); dir.setY(dir.getY() * this.verticalPush);
entity.setVelocity(entity.getVelocity().clone().add(dir.clone().multiply(this.horizontalPush))); GeneralMethods.setVelocity(this, entity, entity.getVelocity().clone().add(dir.clone().multiply(this.horizontalPush)));
entity.setFallDistance(0); entity.setFallDistance(0);
if (entity.getFireTicks() > 0) { if (entity.getFireTicks() > 0) {

14
src/com/projectkorra/projectkorra/earthbending/metal/MetalClips.java
View file

@ -156,7 +156,7 @@ public class MetalClips extends MetalAbility {
vector = GeneralMethods.getDirection(this.player.getLocation(), GeneralMethods.getTargetedLocation(this.player, this.range)); vector = GeneralMethods.getDirection(this.player.getLocation(), GeneralMethods.getTargetedLocation(this.player, this.range));
} }
item.setVelocity(vector.normalize().add(new Vector(0, 0.1, 0).multiply(1.2))); GeneralMethods.setVelocity(this, item, vector.normalize().add(new Vector(0, 0.1, 0).multiply(1.2)));
this.trackedIngots.add(item); this.trackedIngots.add(item);
this.player.getInventory().removeItem(is); this.player.getInventory().removeItem(is);
} }
@ -228,7 +228,7 @@ public class MetalClips extends MetalAbility {
dz = target.getZ() - location.getZ(); dz = target.getZ() - location.getZ();
final Vector vector = new Vector(dx, dy, dz); final Vector vector = new Vector(dx, dy, dz);
vector.normalize(); vector.normalize();
this.targetEntity.setVelocity(vector.multiply(this.metalClipsCount / 2D)); GeneralMethods.setVelocity(this, this.targetEntity, vector.multiply(this.metalClipsCount / 2D));
this.remove(); this.remove();
} }
@ -342,7 +342,7 @@ public class MetalClips extends MetalAbility {
final Item iron = (Item) entity; final Item iron = (Item) entity;
if (Arrays.asList(METAL_ITEMS).contains(iron.getItemStack().getType())) { if (Arrays.asList(METAL_ITEMS).contains(iron.getItemStack().getType())) {
iron.setVelocity(vector.normalize().multiply(this.magnetSpeed).add(new Vector(0, 0.2, 0))); GeneralMethods.setVelocity(this, iron, vector.normalize().multiply(this.magnetSpeed).add(new Vector(0, 0.2, 0)));
} }
} }
} }
@ -367,7 +367,7 @@ public class MetalClips extends MetalAbility {
final Vector vector = GeneralMethods.getDirection(this.targetEntity.getLocation(), this.player.getLocation()); final Vector vector = GeneralMethods.getDirection(this.targetEntity.getLocation(), this.player.getLocation());
if (distance > 0.5) { if (distance > 0.5) {
this.targetEntity.setVelocity(vector.normalize().multiply(0.2)); GeneralMethods.setVelocity(this, this.targetEntity, vector.normalize().multiply(0.2));
} }
} }
@ -384,7 +384,7 @@ public class MetalClips extends MetalAbility {
final Vector vector = GeneralMethods.getDirection(this.targetEntity.getLocation(), GeneralMethods.getTargetedLocation(this.player, 10)); final Vector vector = GeneralMethods.getDirection(this.targetEntity.getLocation(), GeneralMethods.getTargetedLocation(this.player, 10));
if (distance > 1.2) { if (distance > 1.2) {
this.targetEntity.setVelocity(vector.normalize().multiply(0.2)); GeneralMethods.setVelocity(this, this.targetEntity, vector.normalize().multiply(0.2));
} }
} }
@ -401,9 +401,9 @@ public class MetalClips extends MetalAbility {
final Vector vector = GeneralMethods.getDirection(oldLocation, GeneralMethods.getTargetedLocation(this.player, 10)); final Vector vector = GeneralMethods.getDirection(oldLocation, GeneralMethods.getTargetedLocation(this.player, 10));
if (distance > 1.2) { if (distance > 1.2) {
this.targetEntity.setVelocity(vector.normalize().multiply(.5)); GeneralMethods.setVelocity(this, this.targetEntity, vector.normalize().multiply(.5));
} else { } else {
this.targetEntity.setVelocity(new Vector(0, 0, 0)); GeneralMethods.setVelocity(this, this.targetEntity, new Vector(0, 0, 0));
} }
this.targetEntity.setFallDistance(0); this.targetEntity.setFallDistance(0);

75
src/com/projectkorra/projectkorra/event/AbilityVelocityAffectEntityEvent.java Normal file
View file

@ -0,0 +1,75 @@
package com.projectkorra.projectkorra.event;
import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.ability.Ability;
/**
* Cancellable event called when an ability would push or alter the velocity of
* an entity.
*
* the entity can be changed, vector can be modified, and the ability that
* caused the change can be accessed.
*
* @author dNiym
*
*/
public class AbilityVelocityAffectEntityEvent extends Event implements Cancellable {
Entity affected;
Vector velocity;
Ability ability;
boolean cancelled = false;
private static final HandlerList handlers = new HandlerList();
public AbilityVelocityAffectEntityEvent(Ability ability, Entity entity, Vector vector) {
this.affected = entity;
this.ability = ability;
this.velocity = vector;
}
@Override
public boolean isCancelled() {
return cancelled;
}
@Override
public void setCancelled(boolean cancel) {
this.cancelled = cancel;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public Entity getAffected() {
return affected;
}
public void setAffected(Entity affected) {
this.affected = affected;
}
public Vector getVelocity() {
return velocity;
}
public void setVelocity(Vector velocity) {
this.velocity = velocity;
}
public Ability getAbility() {
return ability;
}
public static HandlerList getHandlerList() {
return handlers;
}
}

41
src/com/projectkorra/projectkorra/event/PlayerStanceChangeEvent.java Normal file
View file

@ -0,0 +1,41 @@
package com.projectkorra.projectkorra.event;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
public class PlayerStanceChangeEvent extends Event {
private static final HandlerList HANDLERS = new HandlerList();
private final Player player;
private final String oldStance;
private final String newStance;
public PlayerStanceChangeEvent(final Player player, final String oldStance, final String newStance) {
this.player = player;
this.oldStance = oldStance;
this.newStance = newStance;
}
public Player getPlayer() {
return this.player;
}
public String getOldStance() {
return this.oldStance;
}
public String getNewStance() {
return this.newStance;
}
@Override
public HandlerList getHandlers() {
return HANDLERS;
}
public static HandlerList getHandlerList() {
return HANDLERS;
}
}

20
src/com/projectkorra/projectkorra/firebending/FireBlast.java
View file

@ -110,14 +110,14 @@ public class FireBlast extends FireAbility {
} }
private void applyModifiers(double damage, double range) { private void applyModifiers(double damage, double range) {
int damageMod = 0; double damageMod = 0;
int rangeMod = 0; double rangeMod = 0;
damageMod = (int) (this.getDayFactor(damage) - damage); damageMod = this.getDayFactor(damage) - damage;
rangeMod = (int) (this.getDayFactor(range) - range); rangeMod = this.getDayFactor(range) - range;
damageMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getDamageFactor() * damage - damage) + damageMod : damageMod); damageMod = bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getDamageFactor() * damage - damage) + damageMod : damageMod;
rangeMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getRangeFactor() * range - range) + rangeMod : rangeMod); rangeMod = bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getRangeFactor() * range - range) + rangeMod : rangeMod;
this.range += rangeMod; this.range += rangeMod;
this.damage += damageMod; this.damage += damageMod;
@ -166,6 +166,10 @@ public class FireBlast extends FireAbility {
} }
public boolean checkLocation(Block block) { public boolean checkLocation(Block block) {
if (block.isLiquid()) {
this.remove();
return false;
}
if (!block.isPassable()) { if (!block.isPassable()) {
if (block.getType() == Material.FURNACE && this.powerFurnace) { if (block.getType() == Material.FURNACE && this.powerFurnace) {
final Furnace furnace = (Furnace) block.getState(); final Furnace furnace = (Furnace) block.getState();
@ -199,9 +203,9 @@ public class FireBlast extends FireAbility {
private void affect(final Entity entity) { private void affect(final Entity entity) {
if (entity.getUniqueId() != this.player.getUniqueId() && !GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) { if (entity.getUniqueId() != this.player.getUniqueId() && !GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
if (this.bPlayer.isAvatarState()) { if (this.bPlayer.isAvatarState()) {
GeneralMethods.setVelocity(entity, this.direction.clone().multiply(AvatarState.getValue(this.knockback))); GeneralMethods.setVelocity(this, entity, this.direction.clone().multiply(AvatarState.getValue(this.knockback)));
} else { } else {
GeneralMethods.setVelocity(entity, this.direction.clone().multiply(this.knockback)); GeneralMethods.setVelocity(this, entity, this.direction.clone().multiply(this.knockback));
} }
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
entity.setFireTicks((int) (this.fireTicks * 20)); entity.setFireTicks((int) (this.fireTicks * 20));

14
src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java
View file

@ -89,18 +89,18 @@ public class FireBlastCharged extends FireAbility {
private void applyModifiers() { private void applyModifiers() {
long chargeTimeMod = 0; long chargeTimeMod = 0;
int damageMod = 0; double damageMod = 0;
int rangeMod = 0; double rangeMod = 0;
if (isDay(player.getWorld())) { if (isDay(player.getWorld())) {
chargeTimeMod = (long) (this.chargeTime / getDayFactor()) - this.chargeTime; chargeTimeMod = (long) (this.chargeTime / getDayFactor() - this.chargeTime);
damageMod = (int) (this.getDayFactor(this.maxDamage) - this.maxDamage); damageMod = this.getDayFactor(this.maxDamage) - this.maxDamage;
rangeMod = (int) (this.getDayFactor(this.range) - this.range); rangeMod = this.getDayFactor(this.range) - this.range;
} }
chargeTimeMod = (long) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (chargeTime / BlueFireAbility.getCooldownFactor() - chargeTime) + chargeTimeMod : chargeTimeMod); chargeTimeMod = (long) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (chargeTime / BlueFireAbility.getCooldownFactor() - chargeTime) + chargeTimeMod : chargeTimeMod);
damageMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getDamageFactor() * maxDamage - maxDamage) + damageMod : damageMod); damageMod = (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getDamageFactor() * maxDamage - maxDamage) + damageMod : damageMod);
rangeMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getRangeFactor() * range - range) + rangeMod : rangeMod); rangeMod = (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getRangeFactor() * range - range) + rangeMod : rangeMod);
if (this.bPlayer.isAvatarState()) { if (this.bPlayer.isAvatarState()) {
this.chargeTime = getConfig().getLong("Abilities.Avatar.AvatarState.Fire.FireBlast.Charged.ChargeTime"); this.chargeTime = getConfig().getLong("Abilities.Avatar.AvatarState.Fire.FireBlast.Charged.ChargeTime");

5
src/com/projectkorra/projectkorra/firebending/FireJet.java
View file

@ -10,6 +10,7 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ElementalAbility; import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.FireAbility; import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.airbending.AirSpout; import com.projectkorra.projectkorra.airbending.AirSpout;
@ -57,7 +58,7 @@ public class FireJet extends FireAbility {
final Block block = player.getLocation().getBlock(); final Block block = player.getLocation().getBlock();
if (isIgnitable(block) || ElementalAbility.isAir(block.getType()) || block.getType() == Material.STONE_SLAB || block.getType() == Material.ACACIA_SLAB || block.getType() == Material.BIRCH_SLAB || block.getType() == Material.DARK_OAK_SLAB || block.getType() == Material.JUNGLE_SLAB || block.getType() == Material.OAK_SLAB || block.getType() == Material.SPRUCE_SLAB || isIlluminationTorch(block) || this.bPlayer.isAvatarState()) { if (isIgnitable(block) || ElementalAbility.isAir(block.getType()) || block.getType() == Material.STONE_SLAB || block.getType() == Material.ACACIA_SLAB || block.getType() == Material.BIRCH_SLAB || block.getType() == Material.DARK_OAK_SLAB || block.getType() == Material.JUNGLE_SLAB || block.getType() == Material.OAK_SLAB || block.getType() == Material.SPRUCE_SLAB || isIlluminationTorch(block) || this.bPlayer.isAvatarState()) {
player.setVelocity(player.getEyeLocation().getDirection().clone().normalize().multiply(this.speed)); GeneralMethods.setVelocity(this, player, player.getEyeLocation().getDirection().clone().normalize().multiply(this.speed));
if (!canFireGrief()) { if (!canFireGrief()) {
if (ElementalAbility.isAir(block.getType())) { if (ElementalAbility.isAir(block.getType())) {
createTempFire(block.getLocation()); createTempFire(block.getLocation());
@ -102,7 +103,7 @@ public class FireJet extends FireAbility {
} }
final Vector velocity = this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.speed * timefactor); final Vector velocity = this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.speed * timefactor);
this.player.setVelocity(velocity); GeneralMethods.setVelocity(this, this.player, velocity);
this.player.setFallDistance(0); this.player.setFallDistance(0);
} }
} }

14
src/com/projectkorra/projectkorra/firebending/WallOfFire.java
View file

@ -73,16 +73,16 @@ public class WallOfFire extends FireAbility {
this.origin = GeneralMethods.getTargetedLocation(player, this.range); this.origin = GeneralMethods.getTargetedLocation(player, this.range);
int widthMod = 0; double widthMod = 0;
int heightMod = 0; double heightMod = 0;
long durationMod = 0; long durationMod = 0;
int damageMod = 0; double damageMod = 0;
if (isDay(player.getWorld())) { if (isDay(player.getWorld())) {
widthMod = (int) this.getDayFactor(this.width) - this.width; widthMod = this.getDayFactor(this.width) - this.width;
heightMod = (int) this.getDayFactor(this.height) - this.height; heightMod = this.getDayFactor(this.height) - this.height;
durationMod = ((long) this.getDayFactor(this.duration) - this.duration); durationMod = ((long) this.getDayFactor(this.duration) - this.duration);
damageMod = (int) (this.getDayFactor(this.damage) - this.damage); damageMod = this.getDayFactor(this.damage) - this.damage;
} }
widthMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getRangeFactor() * width - width) + widthMod : widthMod); widthMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getRangeFactor() * width - width) + widthMod : widthMod);
@ -121,7 +121,7 @@ public class WallOfFire extends FireAbility {
} }
private void affect(final Entity entity) { private void affect(final Entity entity) {
GeneralMethods.setVelocity(entity, new Vector(0, 0, 0)); GeneralMethods.setVelocity(this, entity, new Vector(0, 0, 0));
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
final Block block = ((LivingEntity) entity).getEyeLocation().getBlock(); final Block block = ((LivingEntity) entity).getEyeLocation().getBlock();
if (TempBlock.isTempBlock(block) && isIce(block)) { if (TempBlock.isTempBlock(block) && isIce(block)) {

12
src/com/projectkorra/projectkorra/firebending/combo/FireComboStream.java
View file

@ -94,7 +94,15 @@ public class FireComboStream extends BukkitRunnable {
} }
this.location.add(this.direction.normalize().multiply(this.speed)); this.location.add(this.direction.normalize().multiply(this.speed));
if (this.initialLocation.distanceSquared(this.location) > this.distance * this.distance) {
try {
this.location.checkFinite();
} catch (IllegalArgumentException e) {
this.remove();
return;
}
if (this.initialLocation.distanceSquared(this.location) > this.distance * this.distance || !Double.isFinite(this.collisionRadius)) {
this.remove(); this.remove();
return; return;
} else if (this.collides && this.checkCollisionCounter % this.checkCollisionDelay == 0) { } else if (this.collides && this.checkCollisionCounter % this.checkCollisionDelay == 0) {
@ -136,7 +144,7 @@ public class FireComboStream extends BukkitRunnable {
fireSpin.getAffectedEntities().add(entity); fireSpin.getAffectedEntities().add(entity);
final double newKnockback = this.bPlayer.isAvatarState() ? this.knockback + 0.5 : this.knockback; final double newKnockback = this.bPlayer.isAvatarState() ? this.knockback + 0.5 : this.knockback;
DamageHandler.damageEntity(entity, this.damage, coreAbility); DamageHandler.damageEntity(entity, this.damage, coreAbility);
entity.setVelocity(direction.normalize().multiply(newKnockback)); GeneralMethods.setVelocity(coreAbility, entity, direction.normalize().multiply(newKnockback));
} }
} else if (coreAbility.getName().equalsIgnoreCase("JetBlaze")) { } else if (coreAbility.getName().equalsIgnoreCase("JetBlaze")) {
final JetBlaze jetBlaze = CoreAbility.getAbility(this.player, JetBlaze.class); final JetBlaze jetBlaze = CoreAbility.getAbility(this.player, JetBlaze.class);

3
src/com/projectkorra/projectkorra/object/Preset.java
View file

@ -17,6 +17,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import com.projectkorra.projectkorra.BendingPlayer; import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.ProjectKorra; import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility; import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.board.BendingBoardManager;
import com.projectkorra.projectkorra.configuration.ConfigManager; import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.storage.DBConnection; import com.projectkorra.projectkorra.storage.DBConnection;
@ -146,6 +147,7 @@ public class Preset {
} }
} }
bPlayer.setAbilities(abilities); bPlayer.setAbilities(abilities);
BendingBoardManager.updateAllSlots(player);
return boundAll; return boundAll;
} }
@ -256,6 +258,7 @@ public class Preset {
} }
} }
bPlayer.setAbilities(abilities); bPlayer.setAbilities(abilities);
BendingBoardManager.updateAllSlots(player);
return boundAll; return boundAll;
} }
return false; return false;

10
src/com/projectkorra/projectkorra/storage/DBConnection.java
View file

@ -68,6 +68,11 @@ public class DBConnection {
final String query = "CREATE TABLE `pk_cooldowns` (uuid VARCHAR(36) NOT NULL, cooldown_id INTEGER NOT NULL, value BIGINT, PRIMARY KEY (uuid, cooldown_id));"; final String query = "CREATE TABLE `pk_cooldowns` (uuid VARCHAR(36) NOT NULL, cooldown_id INTEGER NOT NULL, value BIGINT, PRIMARY KEY (uuid, cooldown_id));";
sql.modifyQuery(query, false); sql.modifyQuery(query, false);
} }
if (!sql.tableExists("pk_board")) {
ProjectKorra.log.info("Creating pk_board table");
final String query = "CREATE TABLE `pk_board` (uuid VARCHAR(36) NOT NULL, enabled BOOLEAN NOT NULL, PRIMARY KEY (uuid));";
sql.modifyQuery(query, false);
}
} else { } else {
sql = new SQLite(ProjectKorra.log, "Establishing SQLite Connection.", "projectkorra.db", ProjectKorra.plugin.getDataFolder().getAbsolutePath()); sql = new SQLite(ProjectKorra.log, "Establishing SQLite Connection.", "projectkorra.db", ProjectKorra.plugin.getDataFolder().getAbsolutePath());
if (((SQLite) sql).open() == null) { if (((SQLite) sql).open() == null) {
@ -112,6 +117,11 @@ public class DBConnection {
final String query = "CREATE TABLE `pk_cooldowns` (uuid TEXT(36) NOT NULL, cooldown_id INTEGER NOT NULL, value BIGINT, PRIMARY KEY (uuid, cooldown_id));"; final String query = "CREATE TABLE `pk_cooldowns` (uuid TEXT(36) NOT NULL, cooldown_id INTEGER NOT NULL, value BIGINT, PRIMARY KEY (uuid, cooldown_id));";
sql.modifyQuery(query, false); sql.modifyQuery(query, false);
} }
if (!sql.tableExists("pk_board")) {
ProjectKorra.log.info("Creating pk_board table");
final String query = "CREATE TABLE `pk_board` (uuid TEXT(36) NOT NULL, enabled INTEGER NOT NULL, PRIMARY KEY (uuid));";
sql.modifyQuery(query, false);
}
} }
} }

2
src/com/projectkorra/projectkorra/util/BlockSource.java
View file

@ -161,7 +161,7 @@ public class BlockSource {
public static Block getSourceBlock(final Player player, final double range, final BlockSourceType sourceType, final ClickType clickType) { public static Block getSourceBlock(final Player player, final double range, final BlockSourceType sourceType, final ClickType clickType) {
final BlockSourceInformation info = getValidBlockSourceInformation(player, range, sourceType, clickType); final BlockSourceInformation info = getValidBlockSourceInformation(player, range, sourceType, clickType);
if (info != null) { if (info != null) {
if (TempBlock.isTempBlock(info.getBlock()) && !WaterAbility.isBendableWaterTempBlock(info.getBlock())) { if (TempBlock.isTempBlock(info.getBlock()) && !WaterAbility.isBendableWaterTempBlock(info.getBlock()) && !EarthAbility.isBendableEarthTempBlock(info.getBlock())) {
return null; return null;
} }
return info.getBlock(); return info.getBlock();

7
src/com/projectkorra/projectkorra/util/TempBlock.java
View file

@ -53,7 +53,7 @@ public class TempBlock {
public TempBlock(final Block block, final BlockData newData, final long revertTime) { public TempBlock(final Block block, final BlockData newData, final long revertTime) {
this.block = block; this.block = block;
this.newData = newData; this.newData = newData;
this.setRevertTime(revertTime);
if (instances.containsKey(block)) { if (instances.containsKey(block)) {
final TempBlock temp = instances.get(block); final TempBlock temp = instances.get(block);
if (!newData.equals(temp.block.getBlockData())) { if (!newData.equals(temp.block.getBlockData())) {
@ -64,12 +64,15 @@ public class TempBlock {
instances.put(block, temp); instances.put(block, temp);
} else { } else {
this.state = block.getState(); this.state = block.getState();
if (this.state instanceof Container || this.state.getType() == Material.JUKEBOX) { if (this.state instanceof Container || this.state.getType() == Material.JUKEBOX) {
return; return;
} }
instances.put(block, this); instances.put(block, this);
block.setBlockData(newData, GeneralMethods.isLightEmitting(newData.getMaterial())); block.setBlockData(newData, GeneralMethods.isLightEmitting(newData.getMaterial()));
} }
this.setRevertTime(revertTime);
} }
public static TempBlock get(final Block block) { public static TempBlock get(final Block block) {
@ -166,7 +169,7 @@ public class TempBlock {
} }
public void setRevertTime(final long revertTime) { public void setRevertTime(final long revertTime) {
if(revertTime <= 0) { if(revertTime <= 0 || state instanceof Container) {
return; return;
} }

2
src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
View file

@ -207,7 +207,7 @@ public class OctopusForm extends WaterAbility {
} }
final double knock = this.bPlayer.isAvatarState() ? AvatarState.getValue(this.knockback) : this.knockback; final double knock = this.bPlayer.isAvatarState() ? AvatarState.getValue(this.knockback) : this.knockback;
entity.setVelocity(GeneralMethods.getDirection(this.player.getLocation(), location).normalize().multiply(knock)); GeneralMethods.setVelocity(this, entity, GeneralMethods.getDirection(this.player.getLocation(), location).normalize().multiply(knock));
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
DamageHandler.damageEntity(entity, this.damage, this); DamageHandler.damageEntity(entity, this.damage, this);

2
src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
View file

@ -377,7 +377,7 @@ public class SurgeWave extends WaterAbility {
} }
final Vector dir = direction.clone(); final Vector dir = direction.clone();
dir.setY(dir.getY() * this.knockup); dir.setY(dir.getY() * this.knockup);
GeneralMethods.setVelocity(entity, entity.getVelocity().clone().add(dir.clone().multiply(this.getNightFactor(this.knockback)))); GeneralMethods.setVelocity(this, entity, entity.getVelocity().clone().add(dir.clone().multiply(this.getNightFactor(this.knockback))));
entity.setFallDistance(0); entity.setFallDistance(0);
if (entity.getFireTicks() > 0) { if (entity.getFireTicks() > 0) {

4
src/com/projectkorra/projectkorra/waterbending/Torrent.java
View file

@ -591,7 +591,7 @@ public class Torrent extends WaterAbility {
velocity.setZ(vec.getY()); velocity.setZ(vec.getY());
} }
GeneralMethods.setVelocity(entity, velocity); GeneralMethods.setVelocity(this, entity, velocity);
entity.setFallDistance(0); entity.setFallDistance(0);
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
final double damageDealt = this.getNightFactor(this.deflectDamage); final double damageDealt = this.getNightFactor(this.deflectDamage);
@ -611,7 +611,7 @@ public class Torrent extends WaterAbility {
direction.setY(this.knockup); direction.setY(this.knockup);
} }
if (!this.freeze) { if (!this.freeze) {
entity.setVelocity(direction.multiply(this.knockback)); GeneralMethods.setVelocity(this, entity, direction.multiply(this.knockback));
} }
if (entity instanceof LivingEntity && !this.hurtEntities.contains(entity)) { if (entity instanceof LivingEntity && !this.hurtEntities.contains(entity)) {
double damageDealt = this.getNightFactor(this.damage); double damageDealt = this.getNightFactor(this.damage);

2
src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
View file

@ -180,7 +180,7 @@ public class TorrentWave extends WaterAbility {
final Vector direction = GeneralMethods.getDirection(this.origin, entity.getLocation()); final Vector direction = GeneralMethods.getDirection(this.origin, entity.getLocation());
direction.setY(0); direction.setY(0);
direction.normalize(); direction.normalize();
entity.setVelocity(entity.getVelocity().clone().add(direction.multiply(this.knockback))); GeneralMethods.setVelocity(this, entity, entity.getVelocity().clone().add(direction.multiply(this.knockback)));
} }
@Override @Override

4
src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
View file

@ -283,7 +283,7 @@ public class WaterManipulation extends WaterAbility {
} }
final Location location = this.player.getEyeLocation(); final Location location = this.player.getEyeLocation();
final Vector vector = location.getDirection(); final Vector vector = location.getDirection();
entity.setVelocity(vector.normalize().multiply(this.knockback)); GeneralMethods.setVelocity(this, entity, vector.normalize().multiply(this.knockback));
if (this.bPlayer.isAvatarState()) { if (this.bPlayer.isAvatarState()) {
this.damage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.WaterManipulation.Damage"); this.damage = getConfig().getDouble("Abilities.Avatar.AvatarState.Water.WaterManipulation.Damage");
@ -364,7 +364,7 @@ public class WaterManipulation extends WaterAbility {
AFFECTED_BLOCKS.put(block, block); AFFECTED_BLOCKS.put(block, block);
} }
if (PhaseChange.getFrozenBlocksAsBlock().contains(block)) { if (PhaseChange.getFrozenBlocksAsBlock().contains(block)) {
PhaseChange.getFrozenBlocksAsBlock().remove(block); PhaseChange.thaw(block);
} }
new TempBlock(block, Material.WATER); new TempBlock(block, Material.WATER);
} else { } else {

5
src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
View file

@ -299,8 +299,7 @@ public class WaterSpoutWave extends WaterAbility {
if (this.bPlayer.isAvatarState()) { if (this.bPlayer.isAvatarState()) {
currentSpeed = this.getNightFactor(this.speed); currentSpeed = this.getNightFactor(this.speed);
} }
GeneralMethods.setVelocity(this, this.player, this.player.getEyeLocation().getDirection().normalize().multiply(currentSpeed));
this.player.setVelocity(this.player.getEyeLocation().getDirection().normalize().multiply(currentSpeed));
for (final Block block : GeneralMethods.getBlocksAroundPoint(this.player.getLocation().add(0, -1, 0), this.waveRadius)) { for (final Block block : GeneralMethods.getBlocksAroundPoint(this.player.getLocation().add(0, -1, 0), this.waveRadius)) {
if (ElementalAbility.isAir(block.getType()) && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) { if (ElementalAbility.isAir(block.getType()) && !GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
if (this.iceWave) { if (this.iceWave) {
@ -372,7 +371,7 @@ public class WaterSpoutWave extends WaterAbility {
final BukkitRunnable br = new BukkitRunnable() { final BukkitRunnable br = new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
WaterSpoutWave.this.createBlock(block, mat); WaterSpoutWave.this.createBlock(block, block.getLocation().distance(player.getLocation()) >= 1.6 ? mat : Material.WATER);
} }
}; };
br.runTaskLater(ProjectKorra.plugin, delay); br.runTaskLater(ProjectKorra.plugin, delay);

6
src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
View file

@ -153,7 +153,7 @@ public class Bloodbending extends BloodAbility {
vector = GeneralMethods.getDirection(location, GeneralMethods.getTargetedLocation(this.player, location.distance(target))); vector = GeneralMethods.getDirection(location, GeneralMethods.getTargetedLocation(this.player, location.distance(target)));
} }
vector.normalize(); vector.normalize();
entity.setVelocity(vector.multiply(this.knockback)); GeneralMethods.setVelocity(this, entity, vector.multiply(this.knockback));
new HorizontalVelocityTracker(entity, this.player, 200, this); new HorizontalVelocityTracker(entity, this.player, 200, this);
} }
this.remove(); this.remove();
@ -220,7 +220,7 @@ public class Bloodbending extends BloodAbility {
continue; continue;
} }
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
entity.setVelocity(this.vector); GeneralMethods.setVelocity(this, entity, this.vector);
new TempPotionEffect((LivingEntity) entity, effect); new TempPotionEffect((LivingEntity) entity, effect);
entity.setFallDistance(0); entity.setFallDistance(0);
if (entity instanceof Creature) { if (entity instanceof Creature) {
@ -281,7 +281,7 @@ public class Bloodbending extends BloodAbility {
this.vector = new Vector(0, 0, 0); this.vector = new Vector(0, 0, 0);
} }
this.target.setVelocity(this.vector); GeneralMethods.setVelocity(this, this.target, this.vector);
new TempPotionEffect((LivingEntity) this.target, effect); new TempPotionEffect((LivingEntity) this.target, effect);
this.target.setFallDistance(0); this.target.setFallDistance(0);

4
src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java
View file

@ -27,6 +27,10 @@ public class IceWave extends IceAbility implements ComboAbility {
public IceWave(final Player player) { public IceWave(final Player player) {
super(player); super(player);
if (!hasAbility(player, WaterSpoutWave.class)) {
return;
}
if (!this.bPlayer.canBendIgnoreBindsCooldowns(this)) { if (!this.bPlayer.canBendIgnoreBindsCooldowns(this)) {
return; return;
} }

2
src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
View file

@ -246,7 +246,7 @@ public class IceSpikePillar extends IceAbility {
} }
private void affect(final LivingEntity entity) { private void affect(final LivingEntity entity) {
entity.setVelocity(this.thrownForce); GeneralMethods.setVelocity(this, entity, this.thrownForce);
DamageHandler.damageEntity(entity, this.damage, this); DamageHandler.damageEntity(entity, this.damage, this);
this.damaged.add(entity); this.damaged.add(entity);

20
src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java
View file

@ -46,6 +46,7 @@ public class PhaseChange extends IceAbility {
private final List<PhaseChangeType> active_types = new ArrayList<>(); private final List<PhaseChangeType> active_types = new ArrayList<>();
private static Map<TempBlock, Player> PLAYER_BY_BLOCK = new HashMap<>(); private static Map<TempBlock, Player> PLAYER_BY_BLOCK = new HashMap<>();
private static List<Block> BLOCKS = new ArrayList<>();
private final CopyOnWriteArrayList<TempBlock> blocks = new CopyOnWriteArrayList<>(); private final CopyOnWriteArrayList<TempBlock> blocks = new CopyOnWriteArrayList<>();
private final Random r = new Random(); private final Random r = new Random();
@ -99,10 +100,12 @@ public class PhaseChange extends IceAbility {
tb.revertBlock(); tb.revertBlock();
this.blocks.remove(tb); this.blocks.remove(tb);
PLAYER_BY_BLOCK.remove(tb); PLAYER_BY_BLOCK.remove(tb);
BLOCKS.remove(tb.getBlock());
} else if (tb.getLocation().distanceSquared(this.player.getLocation()) > (this.controlRadius * this.controlRadius)) { } else if (tb.getLocation().distanceSquared(this.player.getLocation()) > (this.controlRadius * this.controlRadius)) {
tb.revertBlock(); tb.revertBlock();
this.blocks.remove(tb); this.blocks.remove(tb);
PLAYER_BY_BLOCK.remove(tb); PLAYER_BY_BLOCK.remove(tb);
BLOCKS.remove(tb.getBlock());
} }
} }
} }
@ -129,10 +132,12 @@ public class PhaseChange extends IceAbility {
tb.revertBlock(); tb.revertBlock();
this.blocks.remove(tb); this.blocks.remove(tb);
PLAYER_BY_BLOCK.remove(tb); PLAYER_BY_BLOCK.remove(tb);
BLOCKS.remove(tb.getBlock());
} else if (tb.getLocation().distanceSquared(this.player.getLocation()) > (this.controlRadius * this.controlRadius)) { } else if (tb.getLocation().distanceSquared(this.player.getLocation()) > (this.controlRadius * this.controlRadius)) {
tb.revertBlock(); tb.revertBlock();
this.blocks.remove(tb); this.blocks.remove(tb);
PLAYER_BY_BLOCK.remove(tb); PLAYER_BY_BLOCK.remove(tb);
BLOCKS.remove(tb.getBlock());
} }
} }
} }
@ -301,6 +306,7 @@ public class PhaseChange extends IceAbility {
} }
this.blocks.add(tb); this.blocks.add(tb);
PLAYER_BY_BLOCK.put(tb, this.player); PLAYER_BY_BLOCK.put(tb, this.player);
BLOCKS.add(tb.getBlock());
playIcebendingSound(b.getLocation()); playIcebendingSound(b.getLocation());
} }
@ -382,7 +388,8 @@ public class PhaseChange extends IceAbility {
new TempBlock(b, Material.AIR.createBlockData(), 120 * 1000L); new TempBlock(b, Material.AIR.createBlockData(), 120 * 1000L);
} else { } else {
tb.revertBlock(); tb.revertBlock();
new TempBlock(b, Material.SNOW.createBlockData(d -> ((Snow) d).setLayers(snow.getLayers() - 1)), 120 * 1000L); snow.setLayers(snow.getLayers() - 1);
new TempBlock(b, snow, 120 * 1000L);
} }
} }
} }
@ -407,7 +414,7 @@ public class PhaseChange extends IceAbility {
new TempBlock(b, Material.AIR.createBlockData(), 120 * 1000L); new TempBlock(b, Material.AIR.createBlockData(), 120 * 1000L);
} else { } else {
snow.setLayers(snow.getLayers() - 1); snow.setLayers(snow.getLayers() - 1);
new TempBlock(b, Material.SNOW.createBlockData(d -> ((Snow) d).setLayers(snow.getLayers() - 1)), 120 * 1000L); new TempBlock(b, snow, 120 * 1000L);
} }
} }
@ -432,6 +439,7 @@ public class PhaseChange extends IceAbility {
return false; return false;
} }
PLAYER_BY_BLOCK.remove(tb); PLAYER_BY_BLOCK.remove(tb);
BLOCKS.remove(tb.getBlock());
if (pc.getFrozenBlocks() != null) { if (pc.getFrozenBlocks() != null) {
pc.getFrozenBlocks().remove(tb); pc.getFrozenBlocks().remove(tb);
tb.revertBlock(); tb.revertBlock();
@ -460,18 +468,14 @@ public class PhaseChange extends IceAbility {
} }
public static List<Block> getFrozenBlocksAsBlock() { public static List<Block> getFrozenBlocksAsBlock() {
final List<Block> list = new ArrayList<>(); return BLOCKS;
for (final TempBlock tb : PLAYER_BY_BLOCK.keySet()) {
final Block b = tb.getBlock();
list.add(b);
}
return list;
} }
public void revertFrozenBlocks() { public void revertFrozenBlocks() {
if (this.active_types.contains(PhaseChangeType.FREEZE)) { if (this.active_types.contains(PhaseChangeType.FREEZE)) {
for (final TempBlock tb : this.blocks) { for (final TempBlock tb : this.blocks) {
PLAYER_BY_BLOCK.remove(tb); PLAYER_BY_BLOCK.remove(tb);
BLOCKS.remove(tb.getBlock());
tb.revertBlock(); tb.revertBlock();
} }
this.blocks.clear(); this.blocks.clear();

12
src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsWhip.java
View file

@ -114,7 +114,7 @@ public class WaterArmsWhip extends WaterAbility {
waw.grabbed = false; waw.grabbed = false;
if (waw.grabbedEntity != null) { if (waw.grabbedEntity != null) {
GRABBED_ENTITIES.remove(waw.grabbedEntity); GRABBED_ENTITIES.remove(waw.grabbedEntity);
waw.grabbedEntity.setVelocity(waw.grabbedEntity.getVelocity().multiply(2.5)); GeneralMethods.setVelocity(this, waw.grabbedEntity, waw.grabbedEntity.getVelocity().multiply(2.5));
} }
return; return;
} }
@ -300,7 +300,7 @@ public class WaterArmsWhip extends WaterAbility {
continue; continue;
} }
final Vector vector = endOfArm.toVector().subtract(entity.getLocation().toVector()); final Vector vector = endOfArm.toVector().subtract(entity.getLocation().toVector());
entity.setVelocity(vector.multiply(this.pullMultiplier)); GeneralMethods.setVelocity(this, entity, vector.multiply(this.pullMultiplier));
} }
break; break;
case PUNCH: case PUNCH:
@ -310,7 +310,7 @@ public class WaterArmsWhip extends WaterAbility {
} }
final Vector vector = entity.getLocation().toVector().subtract(endOfArm.toVector()); final Vector vector = entity.getLocation().toVector().subtract(endOfArm.toVector());
entity.setVelocity(vector.multiply(0.15)); GeneralMethods.setVelocity(this, entity, vector.multiply(0.15));
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
if (entity.getEntityId() != this.player.getEntityId()) { if (entity.getEntityId() != this.player.getEntityId()) {
this.hasDamaged = true; this.hasDamaged = true;
@ -373,9 +373,9 @@ public class WaterArmsWhip extends WaterAbility {
final Vector vector = new Vector(dx, dy, dz); final Vector vector = new Vector(dx, dy, dz);
if (distance > 0.5) { if (distance > 0.5) {
this.grabbedEntity.setVelocity(vector.normalize().multiply(.65)); GeneralMethods.setVelocity(this, this.grabbedEntity, vector.normalize().multiply(.65));
} else { } else {
this.grabbedEntity.setVelocity(new Vector(0, 0, 0)); GeneralMethods.setVelocity(this, this.grabbedEntity, new Vector(0, 0, 0));
} }
this.grabbedEntity.setFallDistance(0); this.grabbedEntity.setFallDistance(0);
@ -392,7 +392,7 @@ public class WaterArmsWhip extends WaterAbility {
} }
final Vector vector = this.player.getLocation().toVector().subtract(location.toVector()); final Vector vector = this.player.getLocation().toVector().subtract(location.toVector());
this.player.setVelocity(vector.multiply(-0.25)); GeneralMethods.setVelocity(this, this.player, vector.multiply(-0.25));
this.player.setFallDistance(0); this.player.setFallDistance(0);
} }
} }

3
src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
View file

@ -3,6 +3,7 @@ package com.projectkorra.projectkorra.waterbending.passive;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.CoreAbility; import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility; import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.ability.WaterAbility; import com.projectkorra.projectkorra.ability.WaterAbility;
@ -57,7 +58,7 @@ public class FastSwim extends WaterAbility implements PassiveAbility {
if (this.bPlayer.getBoundAbility() == null || (this.bPlayer.getBoundAbility() != null && !this.bPlayer.getBoundAbility().isSneakAbility())) { if (this.bPlayer.getBoundAbility() == null || (this.bPlayer.getBoundAbility() != null && !this.bPlayer.getBoundAbility().isSneakAbility())) {
if (this.player.isSneaking()) { if (this.player.isSneaking()) {
if (isWater(this.player.getLocation().getBlock()) && !this.bPlayer.isOnCooldown(this)) { if (isWater(this.player.getLocation().getBlock()) && !this.bPlayer.isOnCooldown(this)) {
this.player.setVelocity(this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.swimSpeed)); GeneralMethods.setVelocity(this, this.player, this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.swimSpeed));
} }
} else { } else {
this.bPlayer.addCooldown(this); this.bPlayer.addCooldown(this);

1
src/plugin.yml
View file

@ -43,6 +43,7 @@ permissions:
default: true default: true
description: Grants access to most abilities and basic commands. description: Grants access to most abilities and basic commands.
children: children:
bending.command.board: true
bending.command.bind: true bending.command.bind: true
bending.command.display: true bending.command.display: true
bending.command.toggle: true bending.command.toggle: true