Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 18:47:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into acf-test

Browse Source
This commit is contained in:
Ben Woo 2020-12-31 10:15:25 +08:00 committed by GitHub
commit d0f6434592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -327,7 +327,7 @@
<dependency> <dependency>
<groupId>org.bstats</groupId> <groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId> <artifactId>bstats-bukkit</artifactId>
<version>1.7</version> <version>1.8</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>

2
src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java
View File

@ -50,7 +50,7 @@ public class PlayerDestination implements MVDestination {
*/ */
@Override @Override
public Location getLocation(Entity e) { public Location getLocation(Entity e) {
Player p = plugin.getServer().getPlayer(this.player); Player p = plugin.getServer().getPlayerExact(this.player);
Player plLoc = null; Player plLoc = null;
if (e instanceof Player) { if (e instanceof Player) {
plLoc = (Player) e; plLoc = (Player) e;

2
src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
View File

@ -169,7 +169,7 @@ public class MVPlayerListener implements Listener {
Logging.finer("We know the teleporter is the console! Magical!"); Logging.finer("We know the teleporter is the console! Magical!");
teleporter = this.plugin.getServer().getConsoleSender(); teleporter = this.plugin.getServer().getConsoleSender();
} else { } else {
teleporter = this.plugin.getServer().getPlayer(teleporterName); teleporter = this.plugin.getServer().getPlayerExact(teleporterName);
} }
} }
Logging.finer("Inferred sender '" + teleporter + "' from name '" Logging.finer("Inferred sender '" + teleporter + "' from name '"