Commit 0dc2f2e3 authored by Sol's avatar Sol

Merge branch 'patch-3' into 'master'

Update ReplacementHandler: otherwise it causes crashes

See merge request core-developers/forge!2010
parents 413de957 75cc8d3e
......@@ -90,7 +90,7 @@ public class ReplacementHandler {
if (cause != null && cause.isReplacementAbility()) {
final ReplacementEffect re = cause.getReplacementEffect();
// only return for same layer
if (layer.equals(re.getLayer())) {
if ("Moved".equals(re.getParam("Event")) && layer.equals(re.getLayer())) {
return re.getOtherChoices();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment