Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
396085f609
2 changed files with 2 additions and 2 deletions
|
@ -17,7 +17,7 @@ public class BlockDisplayMeta extends AbstractDisplayMeta {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBlockId(int blockId) {
|
public void setBlockId(int blockId) {
|
||||||
super.metadata.setIndex(OFFSET, EntityDataTypes.INT, blockId);
|
super.metadata.setIndex(OFFSET, EntityDataTypes.BLOCK_STATE, blockId);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ class TaskImpl implements Task {
|
||||||
final int id;
|
final int id;
|
||||||
final Supplier<TaskSchedule> task;
|
final Supplier<TaskSchedule> task;
|
||||||
final ExecutionType type;
|
final ExecutionType type;
|
||||||
final Scheduler owner;
|
final SchedulerImpl owner;
|
||||||
|
|
||||||
TaskImpl(int id, Supplier<TaskSchedule> task, ExecutionType type, SchedulerImpl owner) {
|
TaskImpl(int id, Supplier<TaskSchedule> task, ExecutionType type, SchedulerImpl owner) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
|
Loading…
Reference in a new issue