Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-25 15:50:10 +01:00
Code Issues Releases Aktivität

Merge branches 'dev' and 'master' of https://github.com/MylesIsCool/ViaVersion into dev

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Matsv 2017-06-01 21:47:37 +02:00
Commit 079f8df6e0
2 geänderte Dateien mit 14 neuen und 10 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

22
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
Datei anzeigen

@ -306,18 +306,20 @@ public class WorldPackets {
Item item = Protocol1_9TO1_8.getHandItem(wrapper.user()); Item item = Protocol1_9TO1_8.getHandItem(wrapper.user());
// Blocking patch // Blocking patch
if (Via.getConfig().isShieldBlocking()) { if (Via.getConfig().isShieldBlocking()) {
if (item != null) { EntityTracker tracker = wrapper.user().get(EntityTracker.class);
if (Protocol1_9TO1_8.isSword(item.getId())) {
if (hand == 0) { if (item != null && Protocol1_9TO1_8.isSword(item.getId())) {
EntityTracker tracker = wrapper.user().get(EntityTracker.class); if (hand == 0) {
if (!tracker.isBlocking()) { if (!tracker.isBlocking()) {
tracker.setBlocking(true); tracker.setBlocking(true);
Item shield = new Item((short) 442, (byte) 1, (short) 0, null); Item shield = new Item((short) 442, (byte) 1, (short) 0, null);
tracker.setSecondHand(shield); tracker.setSecondHand(shield);
}
wrapper.cancel();
} }
wrapper.cancel();
} }
} else {
tracker.setSecondHand(null);
tracker.setBlocking(false);
} }
} }
wrapper.write(Type.ITEM, item); wrapper.write(Type.ITEM, item);

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java
Datei anzeigen

@ -162,6 +162,8 @@ public class EntityTracker extends StoredObject {
if (validBlocking.contains(entityID)) { if (validBlocking.contains(entityID)) {
Item shield = new Item((short) 442, (byte) 1, (short) 0, null); Item shield = new Item((short) 442, (byte) 1, (short) 0, null);
setSecondHand(entityID, shield); setSecondHand(entityID, shield);
} else {
setSecondHand(entityID, null);
} }
} else { } else {
setSecondHand(entityID, null); setSecondHand(entityID, null);