SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed events to have a better naming system.

Browse Source
This commit is contained in:
Andrew 2013-08-12 06:32:51 +12:00
parent 18d97c0077
commit 41d5b60ffe
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/me/libraryaddict/disguise/DisguiseAPI.java
View File

@ -14,8 +14,8 @@ import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound.SoundType; import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound.SoundType;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseType; import me.libraryaddict.disguise.DisguiseTypes.DisguiseType;
import me.libraryaddict.disguise.DisguiseTypes.MobDisguise; import me.libraryaddict.disguise.DisguiseTypes.MobDisguise;
import me.libraryaddict.disguise.Events.DisguisedEvent; import me.libraryaddict.disguise.Events.DisguiseEvent;
import me.libraryaddict.disguise.Events.UndisguisedEvent; import me.libraryaddict.disguise.Events.UndisguiseEvent;
import net.minecraft.server.v1_6_R2.AttributeMapServer; import net.minecraft.server.v1_6_R2.AttributeMapServer;
import net.minecraft.server.v1_6_R2.Block; import net.minecraft.server.v1_6_R2.Block;
import net.minecraft.server.v1_6_R2.EntityHuman; import net.minecraft.server.v1_6_R2.EntityHuman;
@ -96,7 +96,7 @@ public class DisguiseAPI {
if (entity == null || disguise == null) if (entity == null || disguise == null)
return; return;
Disguise oldDisguise = getDisguise(entity); Disguise oldDisguise = getDisguise(entity);
DisguisedEvent event = new DisguisedEvent(entity, disguise); DisguiseEvent event = new DisguiseEvent(entity, disguise);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
@ -600,7 +600,7 @@ public class DisguiseAPI {
Disguise disguise = getDisguise(entity); Disguise disguise = getDisguise(entity);
if (disguise == null) if (disguise == null)
return; return;
UndisguisedEvent event = new UndisguisedEvent(entity, disguise); UndisguiseEvent event = new UndisguiseEvent(entity, disguise);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) if (event.isCancelled())
return; return;

6
src/me/libraryaddict/disguise/Events/DisguisedEvent.java → src/me/libraryaddict/disguise/Events/DisguiseEvent.java
View File

@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
public class DisguisedEvent extends Event implements Cancellable { public class DisguiseEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
@ -19,7 +19,7 @@ public class DisguisedEvent extends Event implements Cancellable {
private boolean isCancelled; private boolean isCancelled;
public DisguisedEvent(Entity entity, Disguise disguise) { public DisguiseEvent(Entity entity, Disguise disguise) {
this.disguised = entity; this.disguised = entity;
this.disguise = disguise; this.disguise = disguise;
} }
@ -28,7 +28,7 @@ public class DisguisedEvent extends Event implements Cancellable {
return disguise; return disguise;
} }
public Entity getDisguised() { public Entity getEntity() {
return disguised; return disguised;
} }

6
src/me/libraryaddict/disguise/Events/UndisguisedEvent.java → src/me/libraryaddict/disguise/Events/UndisguiseEvent.java
View File

@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
public class UndisguisedEvent extends Event implements Cancellable { public class UndisguiseEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
@ -19,7 +19,7 @@ public class UndisguisedEvent extends Event implements Cancellable {
private boolean isCancelled; private boolean isCancelled;
public UndisguisedEvent(Entity entity, Disguise disguise) { public UndisguiseEvent(Entity entity, Disguise disguise) {
this.disguised = entity; this.disguised = entity;
this.disguise = disguise; this.disguise = disguise;
} }
@ -28,7 +28,7 @@ public class UndisguisedEvent extends Event implements Cancellable {
return disguise; return disguise;
} }
public Entity getDisguised() { public Entity getEntity() {
return disguised; return disguised;
} }