EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-28 19:54:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
This commit is contained in:
boy0001
2014-10-24 00:25:01 +11:00
parent ce2de462b0 77153e8880
commit 3fd51a5658
6 changed files with 351 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PlotSquared/src/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java
View File

@ -35,9 +35,13 @@ public class PlayerEnterPlotEvent extends PlayerEvent {
return this.plot;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
}

12
PlotSquared/src/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java
View File

@ -34,8 +34,12 @@ public class PlayerLeavePlotEvent extends PlayerEvent {
return this.plot;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
}

17
PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java
View File

@ -1,12 +1,11 @@
package com.intellectualcrafters.plot.events;
import java.util.UUID;
import com.intellectualcrafters.plot.Plot;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.intellectualcrafters.plot.Plot;
import java.util.UUID;
/**
* Created by Citymonstret on 2014-08-16.
@ -71,8 +70,12 @@ public class PlayerPlotDeniedEvent extends Event {
return this.initiator;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
}

17
PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java
View File

@ -1,12 +1,11 @@
package com.intellectualcrafters.plot.events;
import java.util.UUID;
import com.intellectualcrafters.plot.Plot;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.intellectualcrafters.plot.Plot;
import java.util.UUID;
/**
* Created by Citymonstret on 2014-08-16.
@ -70,8 +69,12 @@ public class PlayerPlotHelperEvent extends Event {
return this.initiator;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
}

17
PlotSquared/src/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java
View File

@ -1,12 +1,11 @@
package com.intellectualcrafters.plot.events;
import java.util.UUID;
import com.intellectualcrafters.plot.Plot;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import com.intellectualcrafters.plot.Plot;
import java.util.UUID;
/**
* Created by Citymonstret on 2014-08-16.
@ -70,8 +69,12 @@ public class PlayerPlotTrustedEvent extends Event {
return this.initiator;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
}