Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-22 02:08:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into file-system-rewrite

Browse Source
This commit is contained in:
Esophose 2019-08-15 02:08:09 -06:00
commit 87c0d15d95
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/command/commands/island/VisitCommand.java
View File

@ -20,6 +20,9 @@ public class VisitCommand extends SubCommand {
SoundManager soundManager = skyblock.getSoundManager();
if (args.length == 0) {
if (!skyblock.getPlayerDataManager().hasPlayerData(player))
skyblock.getPlayerDataManager().createPlayerData(player);
PlayerData playerData = skyblock.getPlayerDataManager().getPlayerData(player);
playerData.setType(Visit.Type.Default);
playerData.setSort(Visit.Sort.Default);

4
FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/menus/Leaderboard.java
View File

@ -247,6 +247,10 @@ public class Leaderboard {
playerTexture = offlinePlayer.getTexture();
} else {
playerName = targetPlayer.getName();
if (!playerDataManager.hasPlayerData(targetPlayer))
playerDataManager.createPlayerData(targetPlayer);
playerTexture = playerDataManager.getPlayerData(targetPlayer).getTexture();
}

4
FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/menus/Visit.java
View File

@ -403,6 +403,10 @@ public class Visit {
targetPlayerTexture = offlinePlayer.getTexture();
} else {
targetPlayerName = targetPlayer.getName();
if (!playerDataManager.hasPlayerData(targetPlayer))
playerDataManager.createPlayerData(targetPlayer);
targetPlayerTexture = playerDataManager.getPlayerData(targetPlayer).getTexture();
}

20
FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/utils/version/Materials.java
View File

@ -1147,18 +1147,16 @@ public enum Materials {
// Try 1.12- names
for (Materials mat : Materials.values()) {
if (name.equalsIgnoreCase(mat.name()))
if (name.equalsIgnoreCase(mat.old12Mat)) {
if (pmat == null) {
pmat = mat;
}
if (((byte) mat.data) == data) {
cachedSearch.put(mat.old12Mat + "," + data, mat);
return mat;
}
if (name.equalsIgnoreCase(mat.old12Mat)) {
if (pmat == null) {
pmat = mat;
}
if (((byte) mat.data) == data) {
cachedSearch.put(mat.old12Mat + "," + data, mat);
return mat;
}
}
}
return pmat;

2
build.gradle
View File

@ -1,7 +1,7 @@
allprojects {
apply plugin: 'java'
group = 'com.goodandevil.skyblock'
version = 'Build-78.3'
version = 'Build-78.4'
}
subprojects {