mirror of
https://github.com/Multiverse/Multiverse-Core.git
synced 2024-11-02 16:59:56 +01:00
Removed a bunch of Multiverse Spam
This commit is contained in:
parent
4f7c2d507a
commit
04346f0efc
@ -1,8 +1,5 @@
|
|||||||
package com.onarandombox.MultiverseCore;
|
package com.onarandombox.MultiverseCore;
|
||||||
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.player.PlayerChatEvent;
|
import org.bukkit.event.player.PlayerChatEvent;
|
||||||
@ -15,7 +12,6 @@ import org.bukkit.event.player.PlayerRespawnEvent;
|
|||||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||||
|
|
||||||
public class MVPlayerListener extends PlayerListener {
|
public class MVPlayerListener extends PlayerListener {
|
||||||
private final Logger log = Logger.getLogger("Minecraft");
|
|
||||||
MultiverseCore plugin;
|
MultiverseCore plugin;
|
||||||
|
|
||||||
public MVPlayerListener(MultiverseCore plugin) {
|
public MVPlayerListener(MultiverseCore plugin) {
|
||||||
@ -24,16 +20,8 @@ public class MVPlayerListener extends PlayerListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPlayerTeleport(PlayerTeleportEvent event) {
|
public void onPlayerTeleport(PlayerTeleportEvent event) {
|
||||||
// MultiVerseCore.debugMsg(event.getPlayer().getName() + " just tried to Teleport");
|
|
||||||
// event.setCancelled(true);
|
|
||||||
// Entity entity = event.getPlayer().;
|
|
||||||
// MultiVerseCore.log.info("1 - " + event.getTo().toString());
|
|
||||||
// MultiVerseCore.log.info("2 - " + event.getPlayer().getLocation().toString());
|
|
||||||
MVPlayerSession ps = this.plugin.getPlayerSession(event.getPlayer());
|
MVPlayerSession ps = this.plugin.getPlayerSession(event.getPlayer());
|
||||||
ps.setRespawnWorld(event.getTo().getWorld());
|
ps.setRespawnWorld(event.getTo().getWorld());
|
||||||
|
|
||||||
log.warning("To: " + event.getTo().getWorld().getName());
|
|
||||||
log.warning("From: " + event.getFrom().getWorld().getName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onPlayerKick(PlayerKickEvent event) {
|
public void onPlayerKick(PlayerKickEvent event) {
|
||||||
|
@ -112,7 +112,7 @@ public class MVTeleport {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info("Target location (safe): " + x + ", " + aux + ", " + z);
|
//log.info("Target location (safe): " + x + ", " + aux + ", " + z);
|
||||||
|
|
||||||
return new Location(w, x, aux, z);
|
return new Location(w, x, aux, z);
|
||||||
}
|
}
|
||||||
|
@ -271,10 +271,6 @@ public class MVWorld {
|
|||||||
} else {
|
} else {
|
||||||
this.world.setSpawnFlags(true, this.world.getAllowAnimals());
|
this.world.setSpawnFlags(true, this.world.getAllowAnimals());
|
||||||
}
|
}
|
||||||
System.out.print("Animals: " + this.world.getAllowAnimals());
|
|
||||||
System.out.print("Monsters: " + this.world.getAllowMonsters());
|
|
||||||
System.out.print("Animal List: " + this.getAnimalList());
|
|
||||||
System.out.print("Monster List: " + this.getMonsterList());
|
|
||||||
this.plugin.getWorldPurger().purgeWorld(null, this);
|
this.plugin.getWorldPurger().purgeWorld(null, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -305,7 +301,6 @@ public class MVWorld {
|
|||||||
|
|
||||||
this.setAnimals(value);
|
this.setAnimals(value);
|
||||||
} else if (name.equalsIgnoreCase("monsters")) {
|
} else if (name.equalsIgnoreCase("monsters")) {
|
||||||
System.out.print("Trying to set monsters to: " + value);
|
|
||||||
this.setMonsters(value);
|
this.setMonsters(value);
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
|
@ -54,12 +54,9 @@ public class PurgeCommand extends BaseCommand {
|
|||||||
}
|
}
|
||||||
MVWorld world = this.plugin.getMVWorld(worldName);
|
MVWorld world = this.plugin.getMVWorld(worldName);
|
||||||
|
|
||||||
System.out.println("Purged");
|
|
||||||
PurgeWorlds purger = this.plugin.getWorldPurger();
|
PurgeWorlds purger = this.plugin.getWorldPurger();
|
||||||
ArrayList<String> thingsToKill = new ArrayList<String>();
|
ArrayList<String> thingsToKill = new ArrayList<String>();
|
||||||
if(deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
|
if(deathName.equalsIgnoreCase("all") || deathName.equalsIgnoreCase("animals") || deathName.equalsIgnoreCase("monsters")) {
|
||||||
System.out.print("Found a special case: ");
|
|
||||||
System.out.print(deathName.toUpperCase());
|
|
||||||
thingsToKill.add(deathName.toUpperCase());
|
thingsToKill.add(deathName.toUpperCase());
|
||||||
} else {
|
} else {
|
||||||
Collections.addAll(thingsToKill, deathName.split(","));
|
Collections.addAll(thingsToKill, deathName.split(","));
|
||||||
|
@ -60,8 +60,6 @@ public class TeleportCommand extends BaseCommand {
|
|||||||
teleporter = (Player) sender;
|
teleporter = (Player) sender;
|
||||||
teleportee = (Player) sender;
|
teleportee = (Player) sender;
|
||||||
}
|
}
|
||||||
System.out.print("Teleporter: " + teleporter);
|
|
||||||
System.out.print("Teleportee: " + teleportee);
|
|
||||||
|
|
||||||
Destination d = Destination.parseDestination(worldName, this.plugin);
|
Destination d = Destination.parseDestination(worldName, this.plugin);
|
||||||
if (!(d.getType() == DestinationType.World)) {
|
if (!(d.getType() == DestinationType.World)) {
|
||||||
|
@ -52,7 +52,6 @@ public class PurgeWorlds {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int entitiesKilled = 0;
|
int entitiesKilled = 0;
|
||||||
//System.out.print("Monster Size:" + monstersToKill.size() + " - " + "Animal Size: " + creaturesToKill.size());
|
|
||||||
for (Entity e : world.getEntities()) {
|
for (Entity e : world.getEntities()) {
|
||||||
|
|
||||||
// Check against Monsters
|
// Check against Monsters
|
||||||
@ -66,7 +65,6 @@ public class PurgeWorlds {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.print(entitiesKilled + " entities killed in " + mvworld.getName());
|
|
||||||
entitiesKilled = 0;
|
entitiesKilled = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -75,13 +73,11 @@ public class PurgeWorlds {
|
|||||||
if (e instanceof Squid || e instanceof Animals) {
|
if (e instanceof Squid || e instanceof Animals) {
|
||||||
if (creaturesToKill.contains(entityName) || creaturesToKill.contains("ALL") || creaturesToKill.contains("ANIMALS")) {
|
if (creaturesToKill.contains(entityName) || creaturesToKill.contains("ALL") || creaturesToKill.contains("ANIMALS")) {
|
||||||
if (!negate) {
|
if (!negate) {
|
||||||
System.out.print(entityName + " - Removed");
|
|
||||||
e.remove();
|
e.remove();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (negate) {
|
if (negate) {
|
||||||
System.out.print(entityName + " - Removed");
|
|
||||||
e.remove();
|
e.remove();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -104,13 +100,11 @@ public class PurgeWorlds {
|
|||||||
if (e instanceof Slime || e instanceof Monster) {
|
if (e instanceof Slime || e instanceof Monster) {
|
||||||
if (creaturesToKill.contains(entityName) || creaturesToKill.contains("ALL") || creaturesToKill.contains("MONSTERS")) {
|
if (creaturesToKill.contains(entityName) || creaturesToKill.contains("ALL") || creaturesToKill.contains("MONSTERS")) {
|
||||||
if (!negate) {
|
if (!negate) {
|
||||||
System.out.print(entityName + " - Removed");
|
|
||||||
e.remove();
|
e.remove();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (negate) {
|
if (negate) {
|
||||||
System.out.print(entityName + " - Removed");
|
|
||||||
e.remove();
|
e.remove();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user