Upstream
/
war
mirror of https://github.com/taoneill/war.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #833, fix #832

This commit is contained in:
Connor Monahan 2016-06-06 18:13:09 -04:00
parent f7aa952fb6
commit c1ad45e555
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
war/pom.xml
View File

@ -16,12 +16,12 @@
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<id>bukkit-repo</id> <id>spigot-repo</id>
<url>http://repo.bukkit.org/content/groups/public</url> <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository> </repository>
<repository> <repository>
<id>cma-repo</id> <id>cma-repo</id>
<url>http://maven.cmastudios.me/archiva/repository/internal</url> <url>http://ftp.cmastudios.me/maven/</url>
</repository> </repository>
<repository> <repository>
<id>tagapi-repo</id> <id>tagapi-repo</id>
@ -117,7 +117,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.7.2-R0.2</version> <version>1.9.4-R0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kitteh</groupId> <groupId>org.kitteh</groupId>

3
war/src/main/java/com/tommytony/war/event/WarEntityListener.java
View File

@ -31,6 +31,7 @@ import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.projectiles.ProjectileSource;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.tommytony.war.Team; import com.tommytony.war.Team;
@ -483,7 +484,7 @@ public class WarEntityListener implements Listener {
return; return;
} }
if (event.getEntityType() == EntityType.EGG) { if (event.getEntityType() == EntityType.EGG) {
LivingEntity shooter = event.getEntity().getShooter(); ProjectileSource shooter = event.getEntity().getShooter();
if (shooter instanceof Player) { if (shooter instanceof Player) {
Player player = (Player) shooter; Player player = (Player) shooter;
Warzone zone = Warzone.getZoneByPlayerName(player.getName()); Warzone zone = Warzone.getZoneByPlayerName(player.getName());

6
war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
View File

@ -260,7 +260,7 @@ public class WarPlayerListener implements Listener {
// Whenever a player dies in the middle of conflict they will // Whenever a player dies in the middle of conflict they will
// likely respawn still trying to use their items to attack // likely respawn still trying to use their items to attack
// another player. // another player.
player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, 0); player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1, 0);
} }
if (zone != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ENDER_CHEST && !zone.getWarzoneConfig().getBoolean(WarzoneConfig.ALLOWENDER)) { if (zone != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ENDER_CHEST && !zone.getWarzoneConfig().getBoolean(WarzoneConfig.ALLOWENDER)) {
@ -953,7 +953,7 @@ public class WarPlayerListener implements Listener {
// Prevent thieves from taking their bomb/wool/cake into a chest, etc. // Prevent thieves from taking their bomb/wool/cake into a chest, etc.
if (zone.isThief(player.getName())) { if (zone.isThief(player.getName())) {
event.setCancelled(true); event.setCancelled(true);
player.playSound(player.getLocation(), Sound.FIZZ, 10, 10); player.playSound(player.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 10, 10);
} else // Magically give player a wool block when they click their helmet } else // Magically give player a wool block when they click their helmet
if (event.getSlotType() == InventoryType.SlotType.ARMOR && event.getSlot() == 39 if (event.getSlotType() == InventoryType.SlotType.ARMOR && event.getSlot() == 39
&& zone.getWarzoneConfig().getBoolean(WarzoneConfig.BLOCKHEADS)) { && zone.getWarzoneConfig().getBoolean(WarzoneConfig.BLOCKHEADS)) {
@ -977,7 +977,7 @@ public class WarPlayerListener implements Listener {
} }
if (zone.isImportantBlock(event.getBlockClicked())) { if (zone.isImportantBlock(event.getBlockClicked())) {
event.setCancelled(true); event.setCancelled(true);
player.playSound(player.getLocation(), Sound.FIZZ, 10, 10); player.playSound(player.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 10, 10);
} }
} }
} }