Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-23 07:59:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR Fixes

Browse source
This commit is contained in:
Thijs Wenker 2017-03-18 01:22:06 +01:00
parent 535d4f5dea
commit a8740614e2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/controllers/teleport.js
View file

@ -240,11 +240,11 @@ function Teleporter() {
// We might hit an invisible entity that is not a seat, so we need to do a second pass. // We might hit an invisible entity that is not a seat, so we need to do a second pass.
// * In the second pass we pick against visible entities only. // * In the second pass we pick against visible entities only.
// //
var intersection = Entities.findRayIntersection(pickRay, true, ignoredEntities, [this.targetEntity], false, true); var intersection = Entities.findRayIntersection(pickRay, true, [], [this.targetEntity].concat(ignoredEntities), false, true);
var teleportLocationType = getTeleportTargetType(intersection); var teleportLocationType = getTeleportTargetType(intersection);
if (teleportLocationType === TARGET.INVISIBLE) { if (teleportLocationType === TARGET.INVISIBLE) {
intersection = Entities.findRayIntersection(pickRay, true, ignoredEntities, [this.targetEntity], true, true); intersection = Entities.findRayIntersection(pickRay, true, [], [this.targetEntity].concat(ignoredEntities), true, true);
teleportLocationType = getTeleportTargetType(intersection); teleportLocationType = getTeleportTargetType(intersection);
} }

2
unpublishedScripts/marketplace/boppo/boppoClownEntity.js
View file

@ -19,7 +19,7 @@
]; ];
var PUNCH_COOLDOWN = 300; var PUNCH_COOLDOWN = 300;
Script.include(Script.resolvePath('lookAtEntity.js?v2')); Script.include('lookAtEntity.js');
BoppoClownEntity = function() { BoppoClownEntity = function() {
var _this, var _this,