Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Myles 2017-12-11 12:20:49 +00:00
parent 61836895b0 5a74e129a4
commit 54540fb8ef
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitConfigAPI.java
View File

@ -167,7 +167,7 @@ public class BukkitConfigAPI extends Config implements ViaVersionConfig {
@Override
public boolean is1_12QuickMoveActionFix() {
return getBoolean("quick-move-action-fix", true);
return getBoolean("quick-move-action-fix", false);
}
@Override

6
bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitInventoryQuickMoveProvider.java
View File

@ -44,6 +44,9 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider
if (!supported) {
return false;
}
if (slotId < 0) { // clicked out of inv slot
return false;
}
ProtocolInfo info = userConnection.get(ProtocolInfo.class);
UUID uuid = info.getUuid();
BukkitInventoryUpdateTask updateTask = updateTasks.get(uuid);
@ -66,9 +69,6 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider
}
InventoryView inv = p.getOpenInventory();
short slotId = storage.getSlotId();
if (slotId < 0) { // clicked out of inv slot
return null;
}
if (slotId > inv.countSlots()) {
return null; // wrong container open?
}

3
bungee/src/main/java/us/myles/ViaVersion/bungee/service/ProtocolDetectorService.java
View File

@ -54,7 +54,7 @@ public class ProtocolDetectorService implements Runnable {
serverInfo.ping(new Callback<ServerPing>() {
@Override
public void done(ServerPing serverPing, Throwable throwable) {
if (throwable == null) {
if (throwable == null && serverPing != null && serverPing.getVersion() != null) {
detectedProtocolIds.put(key, serverPing.getVersion().getProtocol());
if (((BungeeConfigAPI) Via.getConfig()).isBungeePingSave()) {
Map<String, Integer> servers = ((BungeeConfigAPI) Via.getConfig()).getBungeeServerProtocols();
@ -69,7 +69,6 @@ public class ProtocolDetectorService implements Runnable {
}
// Save
Via.getPlatform().getConfigurationProvider().saveConfig();
}
}
}

4
common/src/main/resources/assets/viaversion/config.yml
View File

@ -84,8 +84,8 @@ hologram-y: -0.96
piston-animation-patch: false
# Should we fix nbt for 1.12 and above clients in chat messages (causes invalid item)
chat-nbt-fix: true
# Should we fix shift quick move action for 1.12 clients (causes shift + double click not to work when moving items) (only works on 1.8-1.11.2 bukkit based servers)
quick-move-action-fix: true
# Experimental - Should we fix shift quick move action for 1.12 clients (causes shift + double click not to work when moving items) (only works on 1.8-1.11.2 bukkit based servers)
quick-move-action-fix: false
#
#----------------------------------------------------------#
# 1.9 & 1.10 CLIENTS ON 1.8 SERVERS OPTIONS #