TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 11:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4 from PhanaticD/wip-1.13

Browse source 
some fixes
This commit is contained in:
Simplicitee 2019-01-02 19:23:14 -05:00 committed by GitHub
commit a543e13acf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,7 @@ 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.songoda.kingdoms.constants.land.Land; import com.songoda.kingdoms.constants.land.Land;
import com.songoda.kingdoms.constants.land.SimpleChunkLocation; import com.songoda.kingdoms.constants.land.SimpleChunkLocation;
import com.songoda.kingdoms.constants.player.KingdomPlayer; import com.songoda.kingdoms.constants.player.KingdomPlayer;
@ -1428,7 +1429,8 @@ public class GeneralMethods {
if (wg.getPlatform().getGlobalStateManager().get(BukkitAdapter.adapt(location.getWorld())).blockTNTExplosions) { if (wg.getPlatform().getGlobalStateManager().get(BukkitAdapter.adapt(location.getWorld())).blockTNTExplosions) {
return true; return true;
} }
if (!wg.getPlatform().getRegionContainer().createQuery().testState(BukkitAdapter.adapt(location), WorldGuardPlugin.inst().wrapPlayer(player), Flags.TNT)) { StateFlag.State tntflag = wg.getPlatform().getRegionContainer().createQuery().queryState(BukkitAdapter.adapt(location), WorldGuardPlugin.inst().wrapPlayer(player), Flags.TNT);
if (tntflag != null && tntflag.equals(StateFlag.State.DENY)) {
return true; return true;
} }
} }

27
src/com/projectkorra/projectkorra/ability/WaterAbility.java
View file

@ -1,18 +1,5 @@
package com.projectkorra.projectkorra.ability; package com.projectkorra.projectkorra.ability;
import java.util.HashSet;
import java.util.Set;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.Levelled;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.BendingPlayer; import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element; import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods; import com.projectkorra.projectkorra.GeneralMethods;
@ -28,6 +15,18 @@ import com.projectkorra.projectkorra.waterbending.Torrent;
import com.projectkorra.projectkorra.waterbending.WaterSpout; import com.projectkorra.projectkorra.waterbending.WaterSpout;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange; import com.projectkorra.projectkorra.waterbending.ice.PhaseChange;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms; import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.Levelled;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
import java.util.HashSet;
import java.util.Set;
public abstract class WaterAbility extends ElementalAbility { public abstract class WaterAbility extends ElementalAbility {
@ -74,7 +73,7 @@ public abstract class WaterAbility extends ElementalAbility {
public void handleCollision(final Collision collision) { public void handleCollision(final Collision collision) {
super.handleCollision(collision); super.handleCollision(collision);
if (collision.isRemovingFirst()) { if (collision.isRemovingFirst()) {
ParticleEffect.BLOCK_CRACK.display(collision.getLocationFirst(), 10, 1, 1, 1, 0.1); ParticleEffect.BLOCK_CRACK.display(collision.getLocationFirst(), 10, 1, 1, 1, 0.1, collision.getLocationFirst().getBlock().getBlockData());
} }
} }

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

@ -132,7 +132,7 @@ public class AirSuction extends AirAbility {
ignore[i] = AirBlast.TDOORS[i - getTransparentMaterials().length - AirBlast.DOORS.length]; ignore[i] = AirBlast.TDOORS[i - getTransparentMaterials().length - AirBlast.DOORS.length];
} }
} }
final Location location = GeneralMethods.getTargetedLocation(player, getSelectRange(), ignore); final Location location = GeneralMethods.getTargetedLocation(player, getSelectRange(), false, ignore);
if (location.getBlock().isLiquid() || GeneralMethods.isSolid(location.getBlock())) { if (location.getBlock().isLiquid() || GeneralMethods.isSolid(location.getBlock())) {
return; return;
} else if (GeneralMethods.isRegionProtectedFromBuild(player, "AirSuction", location)) { } else if (GeneralMethods.isRegionProtectedFromBuild(player, "AirSuction", location)) {

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

@ -1,9 +1,13 @@
package com.projectkorra.projectkorra.earthbending; package com.projectkorra.projectkorra.earthbending;
import java.util.ArrayList; import com.projectkorra.projectkorra.BendingPlayer;
import java.util.List; import com.projectkorra.projectkorra.GeneralMethods;
import java.util.Random; import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -14,14 +18,9 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.BendingPlayer; import java.util.ArrayList;
import com.projectkorra.projectkorra.GeneralMethods; import java.util.List;
import com.projectkorra.projectkorra.ability.EarthAbility; import java.util.Random;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
public class EarthSmash extends EarthAbility { public class EarthSmash extends EarthAbility {
@ -230,7 +229,6 @@ public class EarthSmash extends EarthAbility {
break; break;
} }
} }
this.draw(); this.draw();
return; return;
} else { } else {
@ -537,7 +535,7 @@ public class EarthSmash extends EarthAbility {
return null; return null;
} }
final List<Block> blocks = GeneralMethods.getBlocksAroundPoint(GeneralMethods.getTargetedLocation(player, this.grabRange, getTransparentMaterials()), 1); final List<Block> blocks = GeneralMethods.getBlocksAroundPoint(GeneralMethods.getTargetedLocation(player, this.grabRange, false, getTransparentMaterials()), 1);
for (final EarthSmash smash : getAbilities(EarthSmash.class)) { for (final EarthSmash smash : getAbilities(EarthSmash.class)) {
if (reqState == null || smash.state == reqState) { if (reqState == null || smash.state == reqState) {
for (final Block block : blocks) { for (final Block block : blocks) {