Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-09-08 22:02:50 +02:00
Merge branch 'master' into dev
Dieser Commit ist enthalten in:
Commit
54540fb8ef
@ -167,7 +167,7 @@ public class BukkitConfigAPI extends Config implements ViaVersionConfig {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean is1_12QuickMoveActionFix() {
|
public boolean is1_12QuickMoveActionFix() {
|
||||||
return getBoolean("quick-move-action-fix", true);
|
return getBoolean("quick-move-action-fix", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -44,6 +44,9 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider
|
|||||||
if (!supported) {
|
if (!supported) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (slotId < 0) { // clicked out of inv slot
|
||||||
|
return false;
|
||||||
|
}
|
||||||
ProtocolInfo info = userConnection.get(ProtocolInfo.class);
|
ProtocolInfo info = userConnection.get(ProtocolInfo.class);
|
||||||
UUID uuid = info.getUuid();
|
UUID uuid = info.getUuid();
|
||||||
BukkitInventoryUpdateTask updateTask = updateTasks.get(uuid);
|
BukkitInventoryUpdateTask updateTask = updateTasks.get(uuid);
|
||||||
@ -66,9 +69,6 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider
|
|||||||
}
|
}
|
||||||
InventoryView inv = p.getOpenInventory();
|
InventoryView inv = p.getOpenInventory();
|
||||||
short slotId = storage.getSlotId();
|
short slotId = storage.getSlotId();
|
||||||
if (slotId < 0) { // clicked out of inv slot
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (slotId > inv.countSlots()) {
|
if (slotId > inv.countSlots()) {
|
||||||
return null; // wrong container open?
|
return null; // wrong container open?
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ public class ProtocolDetectorService implements Runnable {
|
|||||||
serverInfo.ping(new Callback<ServerPing>() {
|
serverInfo.ping(new Callback<ServerPing>() {
|
||||||
@Override
|
@Override
|
||||||
public void done(ServerPing serverPing, Throwable throwable) {
|
public void done(ServerPing serverPing, Throwable throwable) {
|
||||||
if (throwable == null) {
|
if (throwable == null && serverPing != null && serverPing.getVersion() != null) {
|
||||||
detectedProtocolIds.put(key, serverPing.getVersion().getProtocol());
|
detectedProtocolIds.put(key, serverPing.getVersion().getProtocol());
|
||||||
if (((BungeeConfigAPI) Via.getConfig()).isBungeePingSave()) {
|
if (((BungeeConfigAPI) Via.getConfig()).isBungeePingSave()) {
|
||||||
Map<String, Integer> servers = ((BungeeConfigAPI) Via.getConfig()).getBungeeServerProtocols();
|
Map<String, Integer> servers = ((BungeeConfigAPI) Via.getConfig()).getBungeeServerProtocols();
|
||||||
@ -69,7 +69,6 @@ public class ProtocolDetectorService implements Runnable {
|
|||||||
}
|
}
|
||||||
// Save
|
// Save
|
||||||
Via.getPlatform().getConfigurationProvider().saveConfig();
|
Via.getPlatform().getConfigurationProvider().saveConfig();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -84,8 +84,8 @@ hologram-y: -0.96
|
|||||||
piston-animation-patch: false
|
piston-animation-patch: false
|
||||||
# Should we fix nbt for 1.12 and above clients in chat messages (causes invalid item)
|
# Should we fix nbt for 1.12 and above clients in chat messages (causes invalid item)
|
||||||
chat-nbt-fix: true
|
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)
|
# 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: true
|
quick-move-action-fix: false
|
||||||
#
|
#
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
# 1.9 & 1.10 CLIENTS ON 1.8 SERVERS OPTIONS #
|
# 1.9 & 1.10 CLIENTS ON 1.8 SERVERS OPTIONS #
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren