summaryrefslogtreecommitdiff
path: root/server/src/vm/value.lua
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/vm/value.lua')
-rw-r--r--server/src/vm/value.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/server/src/vm/value.lua b/server/src/vm/value.lua
index b3cc5f80..19aa1ee4 100644
--- a/server/src/vm/value.lua
+++ b/server/src/vm/value.lua
@@ -522,7 +522,14 @@ function mt:setEmmy(emmy)
if not emmy then
return
end
- if emmy.type ~= 'emmy.class' and emmy.type ~= 'emmy.type' then
+ if emmy.type == 'emmy.class' then
+ emmy:setValue(self)
+ elseif emmy.type == 'emmy.type' then
+ local class = emmy:getClass()
+ if class then
+ self:mergeValue(class:getValue())
+ end
+ else
return
end
self._emmy = emmy