minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Don't load from player.dat for online players

Browse Source 
Fixes lishid#40 and #5
This commit is contained in:
Jikoo
2016-04-11 15:44:25 -04:00
parent fb48f6a783
commit e39ab10797
18 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java
View File

@@ -19,8 +19,15 @@ package com.lishid.openinv.internal;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
public interface IPlayerDataManager {
public Player loadPlayer(OfflinePlayer offline);
public abstract class IPlayerDataManager {
public final Player loadPlayer(OfflinePlayer offline) {
if (offline.isOnline()) {
return offline.getPlayer();
}
return this.loadOfflinePlayer(offline);
}
public String getPlayerDataID(OfflinePlayer player);
protected abstract Player loadOfflinePlayer(OfflinePlayer offline);
public abstract String getPlayerDataID(OfflinePlayer player);
}

4
src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java
View File

@@ -29,10 +29,10 @@ import net.minecraft.server.v1_4_5.MinecraftServer;
import org.bukkit.craftbukkit.v1_4_5.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java
View File

@@ -29,10 +29,10 @@ import net.minecraft.server.v1_4_6.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_4_6.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.server.v1_4_R1.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java
View File

@@ -29,10 +29,10 @@ import net.minecraft.server.v1_5_R2.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java
View File

@@ -29,10 +29,10 @@ import net.minecraft.server.v1_5_R3.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java
View File

@@ -29,10 +29,10 @@ import net.minecraft.server.v1_6_R1.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java
View File

@@ -29,10 +29,10 @@ import net.minecraft.server.v1_6_R2.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java
View File

@@ -29,10 +29,10 @@ import net.minecraft.server.v1_6_R3.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_7_R1/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
GameProfile profile = new GameProfile(null, offline.getName());

4
src/main/java/com/lishid/openinv/internal/v1_7_R2/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
GameProfile profile = new GameProfile(null, offline.getName());

4
src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());

4
src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());

4
src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.server.v1_8_R1.PlayerInteractManager;
//Volatile
import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
// Create an entity to load the player data

4
src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.server.v1_8_R2.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());

4
src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.server.v1_8_R3.PlayerInteractManager;
//Volatile
import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());

4
src/main/java/com/lishid/openinv/internal/v1_9_R1/PlayerDataManager.java
View File

@@ -30,10 +30,10 @@ import net.minecraft.server.v1_9_R1.PlayerInteractManager;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
public class PlayerDataManager implements IPlayerDataManager {
public class PlayerDataManager extends IPlayerDataManager {
@Override
public Player loadPlayer(OfflinePlayer offline) {
public Player loadOfflinePlayer(OfflinePlayer offline) {
if (offline == null || !offline.hasPlayedBefore()) {
return null;
}

2
src/main/resources/plugin.yml
View File

@@ -1,6 +1,6 @@
name: OpenInv
main: com.lishid.openinv.OpenInv
version: 2.3.0
version: 2.4.1
author: lishid
authors: [Jikoo]
description: >