Item instance max count value for normal items should be long.
Contributed by Sero.
This commit is contained in:
parent
14467b278b
commit
ca2b1beb73
@ -466,7 +466,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -471,7 +471,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -471,7 +471,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -471,7 +471,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -447,7 +447,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -447,7 +447,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -471,7 +471,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -471,7 +471,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -476,7 +476,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -476,7 +476,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -476,7 +476,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -476,7 +476,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -466,7 +466,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
@ -479,7 +479,7 @@ public class ItemInstance extends WorldObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final long old = _count;
|
final long old = _count;
|
||||||
final long max = _itemId == ADENA_ID ? MAX_ADENA : Integer.MAX_VALUE;
|
final long max = _itemId == ADENA_ID ? MAX_ADENA : Long.MAX_VALUE;
|
||||||
|
|
||||||
if ((count > 0) && (_count > (max - count)))
|
if ((count > 0) && (_count > (max - count)))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user