Skip to content

Commit

Permalink
Merge pull request #13 from DrawethreeSoftware/feature/1.11.21
Browse files Browse the repository at this point in the history 
Feature/1.11.21
  • Loading branch information
@Drawethree
Drawethree authored Aug 3, 2022
2 parents c19bcfe + 03d86b2 commit 4f80011
Show file tree
Hide file tree
Showing 23 changed files with 39 additions and 24 deletions.
2 changes: 1 addition & 1 deletion modules/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>UltraPrisonCore</artifactId>
<groupId>me.drawethree</groupId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
19 changes: 17 additions & 2 deletions modules/core/src/main/java/dev/drawethree/ultraprisoncore/gangs/listener/GangsListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import dev.drawethree.ultraprisoncore.utils.player.PlayerUtils;
import me.lucko.helper.Events;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.player.AsyncPlayerChatEvent;
Expand All @@ -26,13 +27,27 @@ public void register() {

private void subscribeToEntityDamageByEntityEvent() {
Events.subscribe(EntityDamageByEntityEvent.class, EventPriority.HIGHEST)
.filter(e -> e.getDamager() instanceof Player && e.getEntity() instanceof Player)
.filter(e -> e.getDamager() instanceof Player && (e.getEntity() instanceof Player || e.getEntity() instanceof Projectile))
.handler(e -> {

if (this.plugin.getConfig().isGangFriendlyFire()) {
return;
}

Player player = (Player) e.getEntity();
Player damager = (Player) e.getDamager();
Player damager = null;
if (e.getDamager() instanceof Player) {
damager = (Player) e.getDamager();
} else if (e.getDamager() instanceof Projectile) {
Projectile projectile = (Projectile) e.getDamager();
if (projectile.getShooter() instanceof Player) {
damager = (Player) projectile.getShooter();
}
}

if (damager == null) {
return;
}

if (this.plugin.getGangsManager().arePlayersInSameGang(player, damager)) {
e.setCancelled(true);
Expand Down
2 changes: 1 addition & 1 deletion modules/dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/v1_10_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_11_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_12_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_13_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_13_R2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_14_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_15_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_16_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_16_R2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_16_R3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_17_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>UltraPrisonCore</artifactId>
<groupId>me.drawethree</groupId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_18_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>UltraPrisonCore</artifactId>
<groupId>me.drawethree</groupId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/v1_18_R2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/v1_19_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/v1_8_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_8_R2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_8_R3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_9_R1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion modules/v1_9_R2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>me.drawethree</groupId>
<artifactId>UltraPrisonCore</artifactId>
<version>1.11.20</version>
<version>1.11.21</version>

<modules>
<module>modules/core</module>
Expand Down

0 comments on commit 4f80011

Please sign in to comment.