diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/Encryption.java index 9f748eb431..af48c998b3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 7] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[0] & 0xff; - old |= (_outKey[1] << 8) & 0xff00; - old |= (_outKey[2] << 16) & 0xff0000; - old |= (_outKey[3] << 24) & 0xff000000; - old += size; - _outKey[0] = (byte) (old & 0xff); - _outKey[1] = (byte) ((old >> 8) & 0xff); - _outKey[2] = (byte) ((old >> 16) & 0xff); - _outKey[3] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 7] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[0] & 0xff; + old |= (_outKey[1] << 8) & 0xff00; + old |= (_outKey[2] << 16) & 0xff0000; + old |= (_outKey[3] << 24) & 0xff000000; + old += size; + _outKey[0] = (byte) (old & 0xff); + _outKey[1] = (byte) ((old >> 8) & 0xff); + _outKey[2] = (byte) ((old >> 16) & 0xff); + _outKey[3] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 7] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[0] & 0xff; - old |= (_inKey[1] << 8) & 0xff00; - old |= (_inKey[2] << 16) & 0xff0000; - old |= (_inKey[3] << 24) & 0xff000000; - old += size; - _inKey[0] = (byte) (old & 0xff); - _inKey[1] = (byte) ((old >> 8) & 0xff); - _inKey[2] = (byte) ((old >> 16) & 0xff); - _inKey[3] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 7] ^ a); + a = b; } + + // Shift key. + int old = _inKey[0] & 0xff; + old |= (_inKey[1] << 8) & 0xff00; + old |= (_inKey[2] << 16) & 0xff0000; + old |= (_inKey[3] << 24) & 0xff000000; + old += size; + _inKey[0] = (byte) (old & 0xff); + _inKey[1] = (byte) ((old >> 8) & 0xff); + _inKey[2] = (byte) ((old >> 16) & 0xff); + _inKey[3] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/Encryption.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/Encryption.java index c2f987c113..bf33fdb596 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/Encryption.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/Encryption.java @@ -42,27 +42,24 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_outKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - a = b ^ _outKey[i & 15] ^ a; - data[offset + i] = (byte) a; - } - - // Shift key. - int old = _outKey[8] & 0xff; - old |= (_outKey[9] << 8) & 0xff00; - old |= (_outKey[10] << 16) & 0xff0000; - old |= (_outKey[11] << 24) & 0xff000000; - old += size; - _outKey[8] = (byte) (old & 0xff); - _outKey[9] = (byte) ((old >> 8) & 0xff); - _outKey[10] = (byte) ((old >> 16) & 0xff); - _outKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + a = b ^ _outKey[i & 15] ^ a; + data[offset + i] = (byte) a; } + + // Shift key. + int old = _outKey[8] & 0xff; + old |= (_outKey[9] << 8) & 0xff00; + old |= (_outKey[10] << 16) & 0xff0000; + old |= (_outKey[11] << 24) & 0xff000000; + old += size; + _outKey[8] = (byte) (old & 0xff); + _outKey[9] = (byte) ((old >> 8) & 0xff); + _outKey[10] = (byte) ((old >> 16) & 0xff); + _outKey[11] = (byte) ((old >> 24) & 0xff); } @Override @@ -73,26 +70,23 @@ public class Encryption implements EncryptionInterface return; } - synchronized (_inKey) + int a = 0; + for (int i = 0; i < size; i++) { - int a = 0; - for (int i = 0; i < size; i++) - { - final int b = data[offset + i] & 0xff; - data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); - a = b; - } - - // Shift key. - int old = _inKey[8] & 0xff; - old |= (_inKey[9] << 8) & 0xff00; - old |= (_inKey[10] << 16) & 0xff0000; - old |= (_inKey[11] << 24) & 0xff000000; - old += size; - _inKey[8] = (byte) (old & 0xff); - _inKey[9] = (byte) ((old >> 8) & 0xff); - _inKey[10] = (byte) ((old >> 16) & 0xff); - _inKey[11] = (byte) ((old >> 24) & 0xff); + final int b = data[offset + i] & 0xff; + data[offset + i] = (byte) (b ^ _inKey[i & 15] ^ a); + a = b; } + + // Shift key. + int old = _inKey[8] & 0xff; + old |= (_inKey[9] << 8) & 0xff00; + old |= (_inKey[10] << 16) & 0xff0000; + old |= (_inKey[11] << 24) & 0xff000000; + old += size; + _inKey[8] = (byte) (old & 0xff); + _inKey[9] = (byte) ((old >> 8) & 0xff); + _inKey[10] = (byte) ((old >> 16) & 0xff); + _inKey[11] = (byte) ((old >> 24) & 0xff); } }