projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
This commit is contained in:
Treeku
2014-05-12 05:01:27 +01:00
parent 4fe246975c 6cb8f40793
commit 4e8eebb718
9 changed files with 85 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+6 -1
View File
@@ -43,6 +43,7 @@ import protocol.swg.objectControllerObjects.ShowFlyText;
import resources.common.OutOfBand;
import resources.datatables.Options;
import resources.datatables.PvpStatus;
import resources.datatables.STF;
import resources.loot.LootGroup;
import resources.objects.ObjectMessageBuilder;
import resources.objects.creature.CreatureObject;
@@ -129,8 +130,10 @@ public class TangibleObject extends SWGObject implements Serializable {
messageBuilder = new TangibleMessageBuilder(this);
}
@Deprecated
public void setCustomName2(String customName) {
setCustomName(customName);
System.err.println("setCustomName2 is now deprecated - please use setCustomName");
}
public int getIncapTimer() {
@@ -641,8 +644,10 @@ public class TangibleObject extends SWGObject implements Serializable {
{
if(getTemplateData().getAttribute("containerVolumeLimit") == null) return false;
int containerVolumeLimit = getTemplateData().getAttribute("containerVolumeLimit");
int containerVolumeLimit = (int)getTemplateData().getAttribute("containerVolumeLimit") >> 8; // Shifting because it seems to be returning an extra byte before it should
if(containerVolumeLimit == 0) return false;
if(NGECore.getInstance().objectService.objsInContainer(this, this) >= containerVolumeLimit) return true;
return false;