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

Fix double chest custom names not displaying

Browse Source 
Closes #175
This commit is contained in:
Jikoo
2021-03-17 00:09:10 -04:00
parent 6e5c332272
commit 3ba82683ec
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/AnySilentContainer.java
View File

@@ -190,29 +190,8 @@ public class AnySilentContainer implements IAnySilentContainer {
InventoryEnderChest enderChest = player.getEnderChest(); InventoryEnderChest enderChest = player.getEnderChest();
enderChest.a((TileEntityEnderChest) tile); enderChest.a((TileEntityEnderChest) tile);
player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> { player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> {
Containers<?> containers; Containers<?> containers = PlayerDataManager.getContainers(enderChest.getSize());
int rows = enderChest.getSize() / 9; int rows = enderChest.getSize() / 9;
switch (rows) {
case 1:
containers = Containers.GENERIC_9X1;
break;
case 2:
containers = Containers.GENERIC_9X2;
break;
case 3:
default:
containers = Containers.GENERIC_9X3;
break;
case 4:
containers = Containers.GENERIC_9X4;
break;
case 5:
containers = Containers.GENERIC_9X5;
break;
case 6:
containers = Containers.GENERIC_9X6;
break;
}
return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows); return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows);
}, new ChatMessage("container.enderchest"))); }, new ChatMessage("container.enderchest")));
bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED); bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
@@ -262,6 +241,12 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
public IChatBaseComponent getScoreboardDisplayName() { public IChatBaseComponent getScoreboardDisplayName() {
if (leftChest.hasCustomName()) {
return leftChest.getScoreboardDisplayName();
}
if (rightChest.hasCustomName()) {
return rightChest.getScoreboardDisplayName();
}
return new ChatMessage("container.chestDouble"); return new ChatMessage("container.chestDouble");
} }
}; };

2
internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java
View File

@@ -190,7 +190,7 @@ public class PlayerDataManager implements IPlayerDataManager {
} }
} }
private @NotNull Containers<?> getContainers(int inventorySize) { static @NotNull Containers<?> getContainers(int inventorySize) {
switch (inventorySize) { switch (inventorySize) {
case 9: case 9:
return Containers.GENERIC_9X1; return Containers.GENERIC_9X1;