Altitude/ctf
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Altitude:4f8a7a041687127f7741c7ea257463d411e87062
Branches Tags
Altitude:master
..
compare: Altitude:8718ca091875f0c1e658d86cc14ca5e51b42f206
Branches Tags
Altitude:master

No commits in common. "4f8a7a041687127f7741c7ea257463d411e87062" and "8718ca091875f0c1e658d86cc14ca5e51b42f206" have entirely different histories.
4f8a7a0416 ... 8718ca0918

2 changed files with 6 additions and 19 deletions
Show Stats Expand all files Collapse all files

19
src/main/java/com/alttd/ctf/events/SnowballEvent.java
View File

@ -48,7 +48,7 @@ public class SnowballEvent implements Listener {
}
@EventHandler
public void onSnowballThrown(ProjectileLaunchEvent event) {
public void onSnowballHitBySnowball(ProjectileLaunchEvent event) {
handleSnowballThrown(event, (shooter, shooterTeamPlayer) -> {
GameClass shooterClass = shooterTeamPlayer.getGameClass();
shooter.setCooldown(Material.SNOWBALL, shooterClass.getThrowTickSpeed());
@ -105,22 +105,11 @@ public class SnowballEvent implements Listener {
return;
}
Optional<TeamPlayer> teamPlayerShooter = gameManager.getTeamPlayer(shooter.getUniqueId());
if (teamPlayerShooter.isEmpty()) {
Optional<TeamPlayer> teamPlayer = gameManager.getTeamPlayer(shooter.getUniqueId());
if (teamPlayer.isEmpty()) {
log.debug("The shooter that hit a player with a snowball was not a team player");
return;
}
Optional<TeamPlayer> teamPlayerHit = gameManager.getTeamPlayer(hitPlayer.getUniqueId());
if (teamPlayerHit.isEmpty()) {
log.debug("The shooter that hit a player with a snowball was not a team player");
return;
}
if (teamPlayerHit.get().getTeam().getId() == teamPlayerShooter.get().getTeam().getId()) {
log.debug("The shooter hit a member of their own team");
return;
}
consumer.apply(hitPlayer, shooter, teamPlayerHit.get());
consumer.apply(hitPlayer, shooter, teamPlayer.get());
}
}

6
src/main/java/com/alttd/ctf/game_class/GameClass.java
View File

@ -62,10 +62,9 @@ public abstract class GameClass {
throw new IllegalArgumentException("Display item has no lore");
}
ArrayList<Component> loreList = new ArrayList<>(lore);
loreList.add(miniMessage.deserialize("<gold>Health: <health>, Damage: <damage> Throw speed: <throw_speed></gold>",
loreList.add(miniMessage.deserialize("<gold>Health: <health>, Damage: <damage></gold>",
Placeholder.parsed("health", String.valueOf(health)),
Placeholder.parsed("damage", String.valueOf(damage)),
Placeholder.parsed("throw_speed", String.valueOf(throwTickSpeed))
Placeholder.parsed("damage", String.valueOf(damage))
));
itemMeta.lore(loreList);
displayItem.setItemMeta(itemMeta);
@ -86,7 +85,6 @@ public abstract class GameClass {
player.setHealth(health);
//Always reset the player inventory since other classes might have had them get items
player.getInventory().clear();
player.clearActivePotionEffects();
player.getInventory().setContents(tools.toArray(ItemStack[]::new));
TeamColor color = teamPlayer.getTeam().getColor();