Merge branch 'master' into 1.15
# Conflicts: # src/main/java/carpet/fakes/StructureFeatureInterface.java # src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
This commit is contained in:
commit
c995716357
41 files changed
+122
-137
No files matched your search
@@ -14,7 +14,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
@Mixin(ServerWorld.class)
|
||||
public abstract class ServerWorld_fakePlayersMixin
|
||||
{
|
||||
@Shadow private boolean ticking;
|
||||
@Shadow
|
||||
boolean ticking;
|
||||
|
||||
@Shadow /*@Nonnull*/ public abstract MinecraftServer getServer();
|
||||
|
||||
|
||||
Reference in new issue
Block a user