icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.16

Browse Source
This commit is contained in:
gnembon committed 2020-03-18 02:01:01 -03:00
2 parents 827299889d 78ee80248b
commit 583e023eb1
25 files changed
+3886 -99
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java
+3 -3
View File
@@ -1,7 +1,7 @@
package carpet.mixins;
import carpet.CarpetServer;
import carpet.script.ExpressionInspector;
import carpet.script.CarpetExpression;
import carpet.CarpetSettings;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
@@ -32,9 +32,9 @@ public abstract class ArmorStandEntity_scarpetMarkerMixin extends LivingEntity
{
if ((CarpetSettings.scriptsAutoload || !CarpetSettings.commandScript.equals("false")) && !world.isClient)
{
if (getScoreboardTags().contains(ExpressionInspector.MARKER_STRING))
if (getScoreboardTags().contains(CarpetExpression.MARKER_STRING))
{
String prefix = ExpressionInspector.MARKER_STRING+"_";
String prefix = CarpetExpression.MARKER_STRING+"_";
Optional<String> owner = getScoreboardTags().stream().filter(s -> s.startsWith(prefix)).findFirst();
if (owner.isPresent())
{