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

[Idea]: Folia support for OpenInv #196

Closed
reabuc wants to merge 137 commits from master into master
pull from: master
merge into: minster586:master
Conversation 1 Commits 137 Files Changed 78 +6117 -2024
66 changed files with 6117 additions and 2024 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9ba401a6e - Show all commits

5
internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/PlayerDataManager.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2021 lishid. All rights reserved. * Copyright (C) 2011-2022 lishid. All rights reserved.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -130,6 +130,9 @@ public class PlayerDataManager implements IPlayerDataManager {
public Player inject(@NotNull Player player) { public Player inject(@NotNull Player player) {
try { try {
ServerPlayer nmsPlayer = getHandle(player); ServerPlayer nmsPlayer = getHandle(player);
if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
return openPlayer;
}
injectPlayer(nmsPlayer); injectPlayer(nmsPlayer);
return nmsPlayer.getBukkitEntity(); return nmsPlayer.getBukkitEntity();
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {

5
internal/v1_18_R1/src/main/java/com/lishid/openinv/internal/v1_18_R1/PlayerDataManager.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2021 lishid. All rights reserved. * Copyright (C) 2011-2022 lishid. All rights reserved.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -130,6 +130,9 @@ public class PlayerDataManager implements IPlayerDataManager {
public Player inject(@NotNull Player player) { public Player inject(@NotNull Player player) {
try { try {
ServerPlayer nmsPlayer = getHandle(player); ServerPlayer nmsPlayer = getHandle(player);
if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
return openPlayer;
}
injectPlayer(nmsPlayer); injectPlayer(nmsPlayer);
return nmsPlayer.getBukkitEntity(); return nmsPlayer.getBukkitEntity();
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {

3
internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/PlayerDataManager.java
View File

@@ -130,6 +130,9 @@ public class PlayerDataManager implements IPlayerDataManager {
public Player inject(@NotNull Player player) { public Player inject(@NotNull Player player) {
try { try {
ServerPlayer nmsPlayer = getHandle(player); ServerPlayer nmsPlayer = getHandle(player);
if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
return openPlayer;
}
injectPlayer(nmsPlayer); injectPlayer(nmsPlayer);
return nmsPlayer.getBukkitEntity(); return nmsPlayer.getBukkitEntity();
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {