geforkt von Mirrors/Paper
199 Zeilen
7.6 KiB
Diff
199 Zeilen
7.6 KiB
Diff
From 78cd8cc1024bdc966f9af150ec1281a071375be4 Mon Sep 17 00:00:00 2001
|
|
From: Iceee <andrew@opticgaming.tv>
|
|
Date: Sun, 8 Mar 2015 03:16:39 -0500
|
|
Subject: [PATCH] Move sound handling out of the chest tick loop
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
|
|
index 8af9e32..d30f2f8 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityChest.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityChest.java
|
|
@@ -12,13 +12,13 @@ public class TileEntityChest extends TileEntityContainer implements IUpdatePlaye
|
|
|
|
private ItemStack[] items = new ItemStack[27];
|
|
public boolean a;
|
|
- public TileEntityChest f;
|
|
- public TileEntityChest g;
|
|
- public TileEntityChest h;
|
|
- public TileEntityChest i;
|
|
- public float j;
|
|
+ public TileEntityChest f; // PaperSpigot - adjacentChestZNeg
|
|
+ public TileEntityChest g; // PaperSpigot - adjacentChestXPos
|
|
+ public TileEntityChest h; // PaperSpigot - adjacentChestXNeg
|
|
+ public TileEntityChest i; // PaperSpigot - adjacentChestZPos
|
|
+ public float j; // PaperSpigot - lidAngle
|
|
public float k;
|
|
- public int l;
|
|
+ public int l; // PaperSpigot - numPlayersUsing
|
|
private int n;
|
|
private int o = -1;
|
|
private String p;
|
|
@@ -238,6 +238,8 @@ public class TileEntityChest extends TileEntityContainer implements IUpdatePlaye
|
|
}
|
|
|
|
public void c() {
|
|
+ // PaperSpigot - Move chest sounds out of the tick loop
|
|
+ /*
|
|
this.m();
|
|
int i = this.position.getX();
|
|
int j = this.position.getY();
|
|
@@ -318,7 +320,8 @@ public class TileEntityChest extends TileEntityContainer implements IUpdatePlaye
|
|
this.j = 0.0F;
|
|
}
|
|
}
|
|
-
|
|
+ */
|
|
+ // PaperSpigot end
|
|
}
|
|
|
|
public boolean c(int i, int j) {
|
|
@@ -339,6 +342,28 @@ public class TileEntityChest extends TileEntityContainer implements IUpdatePlaye
|
|
|
|
++this.l;
|
|
if (this.world == null) return; // CraftBukkit
|
|
+
|
|
+ // PaperSpigot start - Move chest open sound out of the tick loop
|
|
+ this.m();
|
|
+
|
|
+ if (this.l > 0 && this.j == 0.0F && this.f == null && this.h == null) {
|
|
+ this.j = 0.7F;
|
|
+
|
|
+ double d0 = (double) this.position.getZ() + 0.5D;
|
|
+ double d1 = (double) this.position.getX() + 0.5D;
|
|
+
|
|
+ if (this.i != null) {
|
|
+ d0 += 0.5D;
|
|
+ }
|
|
+
|
|
+ if (this.g != null) {
|
|
+ d1 += 0.5D;
|
|
+ }
|
|
+
|
|
+ this.world.makeSound(d1, (double) this.position.getY() + 0.5D, d0, "random.chestopen", 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
|
|
+ }
|
|
+ // PaperSpigot end
|
|
+
|
|
this.world.playBlockAction(this.position, this.w(), 1, this.l);
|
|
|
|
// CraftBukkit start - Call redstone event
|
|
@@ -361,6 +386,33 @@ public class TileEntityChest extends TileEntityContainer implements IUpdatePlaye
|
|
int oldPower = Math.max(0, Math.min(15, this.l)); // CraftBukkit - Get power before new viewer is added
|
|
--this.l;
|
|
if (this.world == null) return; // CraftBukkit
|
|
+
|
|
+ // PaperSpigot start - Move chest close sound handling out of the tick loop
|
|
+ if (this.l == 0 && this.j > 0.0F || this.l > 0 && this.j < 1.0F) {
|
|
+ float f = 0.1F;
|
|
+
|
|
+ if (this.l > 0) {
|
|
+ this.j += f;
|
|
+ } else {
|
|
+ this.j -= f;
|
|
+ }
|
|
+
|
|
+ double d0 = (double) this.getPosition().getX() + 0.5D;
|
|
+ double d2 = (double) this.getPosition().getZ() + 0.5D;
|
|
+
|
|
+ if (this.i != null) {
|
|
+ d2 += 0.5D;
|
|
+ }
|
|
+
|
|
+ if (this.g != null) {
|
|
+ d0 += 0.5D;
|
|
+ }
|
|
+
|
|
+ this.world.makeSound(d0, (double) this.getPosition().getY() + 0.5D, d2, "random.chestclosed", 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
|
|
+ this.j = 0.0F;
|
|
+ }
|
|
+ // PaperSpigot end
|
|
+
|
|
this.world.playBlockAction(this.position, this.w(), 1, this.l);
|
|
|
|
// CraftBukkit start - Call redstone event
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
|
|
index f712885..d2ef4c4 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
|
|
@@ -2,14 +2,16 @@ package net.minecraft.server;
|
|
|
|
public class TileEntityEnderChest extends TileEntity implements IUpdatePlayerListBox {
|
|
|
|
- public float a;
|
|
+ public float a; // PaperSpigot - lidAngle
|
|
public float f;
|
|
- public int g;
|
|
+ public int g; // PaperSpigot - numPlayersUsing
|
|
private int h;
|
|
|
|
public TileEntityEnderChest() {}
|
|
|
|
public void c() {
|
|
+ // PaperSpigot start - Move enderchest sound handling out of the tick loop
|
|
+ /*
|
|
if (++this.h % 4 == 0) { // PaperSpigot - Reduced (20 * 4) -> 4 interval due to reduced tick rate from improved tick handling
|
|
this.world.playBlockAction(this.position, Blocks.ENDER_CHEST, 1, this.g);
|
|
}
|
|
@@ -54,7 +56,8 @@ public class TileEntityEnderChest extends TileEntity implements IUpdatePlayerLis
|
|
this.a = 0.0F;
|
|
}
|
|
}
|
|
-
|
|
+ */
|
|
+ // PaperSpigot end
|
|
}
|
|
|
|
public boolean c(int i, int j) {
|
|
@@ -73,11 +76,34 @@ public class TileEntityEnderChest extends TileEntity implements IUpdatePlayerLis
|
|
|
|
public void b() {
|
|
++this.g;
|
|
+
|
|
+ // PaperSpigot start - Move enderchest open sounds out of the tick loop
|
|
+ if (this.g > 0 && this.a == 0.0F) {
|
|
+ this.a = 0.7F;
|
|
+
|
|
+ double d1 = (double) this.getPosition().getX() + 0.5D;
|
|
+ double d0 = (double) this.getPosition().getZ() + 0.5D;
|
|
+
|
|
+ this.world.makeSound(d1, (double) this.getPosition().getY() + 0.5D, d0, "random.chestopen", 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
|
|
+ }
|
|
+ // PaperSpigot end
|
|
+
|
|
this.world.playBlockAction(this.position, Blocks.ENDER_CHEST, 1, this.g);
|
|
}
|
|
|
|
public void d() {
|
|
--this.g;
|
|
+
|
|
+ // PaperSpigot start - Move enderchest close sounds out of the tick loop
|
|
+ if (this.g == 0 && this.a > 0.0F || this.g > 0 && this.a < 1.0F) {
|
|
+ double d0 = (double) this.getPosition().getX() + 0.5D;
|
|
+ double d2 = (double) this.getPosition().getZ() + 0.5D;
|
|
+
|
|
+ this.world.makeSound(d0, (double) this.getPosition().getY() + 0.5D, d2, "random.chestclosed", 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
|
|
+ this.a = 0.0F;
|
|
+ }
|
|
+ // PaperSpigot end
|
|
+
|
|
this.world.playBlockAction(this.position, Blocks.ENDER_CHEST, 1, this.g);
|
|
}
|
|
|
|
diff --git a/src/main/java/org/github/paperspigot/WorldTileEntityList.java b/src/main/java/org/github/paperspigot/WorldTileEntityList.java
|
|
index 5af5dcc..693f75c 100644
|
|
--- a/src/main/java/org/github/paperspigot/WorldTileEntityList.java
|
|
+++ b/src/main/java/org/github/paperspigot/WorldTileEntityList.java
|
|
@@ -26,7 +26,9 @@ public class WorldTileEntityList extends HashSet<TileEntity> {
|
|
TileEntityCommand.class,
|
|
TileEntitySkull.class,
|
|
TileEntityComparator.class,
|
|
- TileEntityFlowerPot.class
|
|
+ TileEntityFlowerPot.class,
|
|
+ TileEntityChest.class,
|
|
+ TileEntityEnderChest.class
|
|
}) {
|
|
put(ignored, -1);
|
|
}
|
|
--
|
|
1.9.1
|
|
|