Generic cleanup

By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
Bukkit/Spigot 2011-06-12 01:18:17 +02:00
parent da51cfa4b1
commit c5408f1030
9 changed files with 142 additions and 134 deletions

View file

@ -1,9 +1,11 @@
package org.bukkit.event.entity;
import org.bukkit.entity.Entity;
import org.bukkit.Location;
import org.bukkit.event.Cancellable;
/**
* Stores data for entities standing inside a portal block
*/

View file

@ -1,9 +1,11 @@
package org.bukkit.event.player;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.block.Block;
/**
* Called when a player completes the portaling process by standing in a portal
*/
@ -16,6 +18,7 @@ public class PlayerPortalEvent extends PlayerTeleportEvent {
public void useTravelAgent(boolean useTravelAgent) {
this.useTravelAgent = useTravelAgent;
}
public boolean useTravelAgent() {
return useTravelAgent;
}

View file

@ -1,10 +1,12 @@
package org.bukkit.event.world;
import org.bukkit.block.Block;
import org.bukkit.World;
import org.bukkit.event.Cancellable;
import java.util.ArrayList;
/**
* Called when the world attempts to create a matching end to a portal
*/

View file

@ -95,6 +95,7 @@ public class MaterialData {
public boolean equals(Object obj) {
if (obj != null && obj instanceof MaterialData) {
MaterialData md = (MaterialData) obj;
return (md.getItemTypeId() == getItemTypeId() && md.getData() == getData());
} else {
return false;