yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ranged ammo can now authentically be taken to Entrana

Browse Source
This commit is contained in:
Dan Ginovker
2022-12-22 08:52:31 +00:00
committed by Ryan
parent d808dd1137
commit 5816423628
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/cache/def/impl/ItemDefinition.java
Vendored
+10 -4
View File
@@ -1,5 +1,6 @@
package core.cache.def.impl; package core.cache.def.impl;
import api.EquipmentSlot;
import core.cache.Cache; import core.cache.Cache;
import core.cache.def.Definition; import core.cache.def.Definition;
import core.cache.misc.buffer.ByteBufferUtils; import core.cache.misc.buffer.ByteBufferUtils;
@@ -26,6 +27,8 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Arrays; import java.util.Arrays;
import static api.ContentAPIKt.equipSlot;
/** /**
* Represents an item's definitions. * Represents an item's definitions.
* @author Jagex * @author Jagex
@@ -649,7 +652,7 @@ public class ItemDefinition extends Definition<Item> {
/** /**
* The allowed ids. * The allowed ids.
*/ */
private static final HashSet<Integer> allowedItems = new HashSet(Arrays.asList( private static final HashSet<Integer> entranaAllowedItems = new HashSet(Arrays.asList(
Items.PENANCE_GLOVES_10553, Items.PENANCE_GLOVES_10553,
Items.ICE_GLOVES_1580, Items.ICE_GLOVES_1580,
Items.BOOTS_OF_LIGHTNESS_88, Items.BOOTS_OF_LIGHTNESS_88,
@@ -678,7 +681,7 @@ public class ItemDefinition extends Definition<Item> {
Items.WARLOCK_LEGS_14077, Items.WARLOCK_LEGS_14077,
Items.WARLOCK_TOP_14076 Items.WARLOCK_TOP_14076
)); ));
private static final HashSet<Integer> bannedItems = new HashSet(Arrays.asList( private static final HashSet<Integer> entranaBannedItems = new HashSet(Arrays.asList(
/**Items.BUTTERFLY_NET_10010, easing the restriction until barehanded implementation**/ /**Items.BUTTERFLY_NET_10010, easing the restriction until barehanded implementation**/
Items.DWARF_CANNON_SET_11967, Items.DWARF_CANNON_SET_11967,
Items.CANNON_BARRELS_10, Items.CANNON_BARRELS_10,
@@ -702,12 +705,15 @@ public class ItemDefinition extends Definition<Item> {
* @return {@code True} if so. * @return {@code True} if so.
*/ */
public boolean isAllowedOnEntrana() { public boolean isAllowedOnEntrana() {
if(allowedItems.contains(getId())) { if (entranaAllowedItems.contains(getId())) {
return true; return true;
} }
if(bannedItems.contains(getId())) { if (entranaBannedItems.contains(getId())) {
return false; return false;
} }
if (equipSlot(getId()) == EquipmentSlot.AMMO) {
return true;
}
if (getName().toLowerCase().startsWith("ring") || getName().toLowerCase().startsWith("amulet")) { if (getName().toLowerCase().startsWith("ring") || getName().toLowerCase().startsWith("amulet")) {
return true; return true;
} }