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

Use PlayerWrapper objects instead of Bukkit Players in player-related events

This commit is contained in:
Daniel Saukel 2020-04-25 18:27:08 +02:00
parent 3a5d211506
commit 007f65c103
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/de/erethon/dungeonsxl/api/event/group/GroupCollectRewardEvent.java
View File

@ -15,6 +15,7 @@
package de.erethon.dungeonsxl.api.event.group;
import de.erethon.dungeonsxl.api.Reward;
import de.erethon.dungeonsxl.api.player.GamePlayer;
import de.erethon.dungeonsxl.api.player.PlayerGroup;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
@ -32,10 +33,10 @@ public class GroupCollectRewardEvent extends GroupEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private Player collector;
private GamePlayer collector;
private Reward reward;
public GroupCollectRewardEvent(PlayerGroup group, Player collector, Reward reward) {
public GroupCollectRewardEvent(PlayerGroup group, GamePlayer collector, Reward reward) {
super(group);
this.collector = collector;
this.reward = reward;
@ -48,7 +49,7 @@ public class GroupCollectRewardEvent extends GroupEvent implements Cancellable {
*
* @return the player who collected the reward
*/
public Player getCollector() {
public GamePlayer getCollector() {
return collector;
}

8
api/src/main/java/de/erethon/dungeonsxl/api/event/group/GroupCreateEvent.java
View File

@ -14,8 +14,8 @@
*/
package de.erethon.dungeonsxl.api.event.group;
import de.erethon.dungeonsxl.api.player.GlobalPlayer;
import de.erethon.dungeonsxl.api.player.PlayerGroup;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
@ -50,10 +50,10 @@ public class GroupCreateEvent extends GroupEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private Player creator;
private GlobalPlayer creator;
private Cause cause;
public GroupCreateEvent(PlayerGroup group, Player creator, Cause cause) {
public GroupCreateEvent(PlayerGroup group, GlobalPlayer creator, Cause cause) {
super(group);
this.creator = creator;
this.cause = cause;
@ -64,7 +64,7 @@ public class GroupCreateEvent extends GroupEvent implements Cancellable {
*
* @return the player who created the group
*/
public Player getCreator() {
public GlobalPlayer getCreator() {
return creator;
}

8
api/src/main/java/de/erethon/dungeonsxl/api/event/group/GroupDisbandEvent.java
View File

@ -14,8 +14,8 @@
*/
package de.erethon.dungeonsxl.api.event.group;
import de.erethon.dungeonsxl.api.player.GlobalPlayer;
import de.erethon.dungeonsxl.api.player.PlayerGroup;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
@ -40,7 +40,7 @@ public class GroupDisbandEvent extends GroupEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private Player disbander;
private GlobalPlayer disbander;
private Cause cause;
public GroupDisbandEvent(PlayerGroup group, Cause cause) {
@ -48,7 +48,7 @@ public class GroupDisbandEvent extends GroupEvent implements Cancellable {
this.cause = cause;
}
public GroupDisbandEvent(PlayerGroup group, Player disbander, Cause cause) {
public GroupDisbandEvent(PlayerGroup group, GlobalPlayer disbander, Cause cause) {
super(group);
this.disbander = disbander;
this.cause = cause;
@ -61,7 +61,7 @@ public class GroupDisbandEvent extends GroupEvent implements Cancellable {
*
* @return the player who disbanded the group
*/
public Player getDisbander() {
public GlobalPlayer getDisbander() {
return disbander;
}

8
api/src/main/java/de/erethon/dungeonsxl/api/event/group/GroupPlayerLeaveEvent.java
View File

@ -14,8 +14,8 @@
*/
package de.erethon.dungeonsxl.api.event.group;
import de.erethon.dungeonsxl.api.player.GlobalPlayer;
import de.erethon.dungeonsxl.api.player.PlayerGroup;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
@ -29,9 +29,9 @@ public class GroupPlayerLeaveEvent extends GroupEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private Player player;
private GlobalPlayer player;
public GroupPlayerLeaveEvent(PlayerGroup group, Player player) {
public GroupPlayerLeaveEvent(PlayerGroup group, GlobalPlayer player) {
super(group);
this.player = player;
}
@ -41,7 +41,7 @@ public class GroupPlayerLeaveEvent extends GroupEvent implements Cancellable {
*
* @return the player who left the group
*/
public Player getPlayer() {
public GlobalPlayer getPlayer() {
return player;
}

8
api/src/main/java/de/erethon/dungeonsxl/api/event/group/GroupScoreEvent.java
View File

@ -14,8 +14,8 @@
*/
package de.erethon.dungeonsxl.api.event.group;
import de.erethon.dungeonsxl.api.player.GamePlayer;
import de.erethon.dungeonsxl.api.player.PlayerGroup;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
@ -29,10 +29,10 @@ public class GroupScoreEvent extends GroupEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
private Player scorer;
private GamePlayer scorer;
private PlayerGroup loserGroup;
public GroupScoreEvent(PlayerGroup group, Player scorer, PlayerGroup loserGroup) {
public GroupScoreEvent(PlayerGroup group, GamePlayer scorer, PlayerGroup loserGroup) {
super(group);
this.scorer = scorer;
this.loserGroup = loserGroup;
@ -43,7 +43,7 @@ public class GroupScoreEvent extends GroupEvent implements Cancellable {
*
* @return the player who scored
*/
public Player getScorer() {
public GamePlayer getScorer() {
return scorer;
}