Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tabs

Browse source
This commit is contained in:
David Back 2018-05-09 18:20:07 -07:00
parent 7738a2bcdd
commit 1aa653c5db
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/html/js/entityProperties.js
View file

@ -1045,7 +1045,7 @@ function loaded() {
elCloneableGroup.style.display = elCloneable.checked ? "block": "none"; elCloneableGroup.style.display = elCloneable.checked ? "block": "none";
elCloneableLimit.value = properties.cloneableLimit; elCloneableLimit.value = properties.cloneableLimit;
elCloneableLifetime.value = properties.cloneableLifetime; elCloneableLifetime.value = properties.cloneableLifetime;
var grabbablesSet = false; var grabbablesSet = false;
var parsedUserData = {}; var parsedUserData = {};
try { try {
@ -1439,11 +1439,11 @@ function loaded() {
} }
userDataChanger("grabbableKey", "grabbable", elGrabbable, elUserData, true); userDataChanger("grabbableKey", "grabbable", elGrabbable, elUserData, true);
}); });
elCloneable.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneable')); elCloneable.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneable'));
elCloneableDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneableDynamic')); elCloneableDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneableDynamic'));
elCloneableLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneableLifetime')); elCloneableLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneableLifetime'));
elCloneableLimit.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneableLimit')); elCloneableLimit.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneableLimit'));
elWantsTrigger.addEventListener('change', function() { elWantsTrigger.addEventListener('change', function() {
userDataChanger("grabbableKey", "wantsTrigger", elWantsTrigger, elUserData, false); userDataChanger("grabbableKey", "wantsTrigger", elWantsTrigger, elUserData, false);

16
scripts/system/libraries/cloneEntityUtils.js
View file

@ -47,13 +47,13 @@ propsAreCloneDynamic = function(props) {
}; };
cloneEntity = function(props, worldEntityProps) { cloneEntity = function(props, worldEntityProps) {
var entityToClone = props.id; var entityToClone = props.id;
var certificateID = Entities.getEntityProperties(entityToClone, ['certificateID']).certificateID; var certificateID = Entities.getEntityProperties(entityToClone, ['certificateID']).certificateID;
// ensure entity is cloneable and does not have a certificate ID, whereas cloneable limits // ensure entity is cloneable and does not have a certificate ID, whereas cloneable limits
// will now be handled by the server where the entity add will fail if limit reached // will now be handled by the server where the entity add will fail if limit reached
if (entityIsCloneable(props) && (certificateID === undefined || certificateID.length === 0)) { if (entityIsCloneable(props) && (certificateID === undefined || certificateID.length === 0)) {
var cloneID = Entities.cloneEntity(entityToClone); var cloneID = Entities.cloneEntity(entityToClone);
return cloneID; return cloneID;
} }
return null; return null;
}; };

2
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -126,7 +126,7 @@ DISPATCHER_PROPERTIES = [
"userData", "userData",
"type", "type",
"href", "href",
"cloneable" "cloneable"
]; ];
// priority -- a lower priority means the module will be asked sooner than one with a higher priority in a given update step // priority -- a lower priority means the module will be asked sooner than one with a higher priority in a given update step