EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 05:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix block data setting

Browse Source
This commit is contained in:
boy0001 2015-02-26 22:41:03 +11:00
parent 8e8489d4a7
commit fe71f43c49
2 changed files with 99 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
View File

@ -293,7 +293,7 @@ public abstract class ClassicPlotManager extends SquarePlotManager {
public boolean claimPlot(final PlotWorld plotworld, final Plot plot) { public boolean claimPlot(final PlotWorld plotworld, final Plot plot) {
final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK; final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK;
final PlotBlock claim = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK; final PlotBlock claim = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK;
if (claim.equals(unclaim)) { if (!claim.equals(unclaim)) {
setWall(plotworld, plot.id, new PlotBlock[] { claim }); setWall(plotworld, plot.id, new PlotBlock[] { claim });
} }
return true; return true;
@ -303,7 +303,7 @@ public abstract class ClassicPlotManager extends SquarePlotManager {
public boolean unclaimPlot(final PlotWorld plotworld, final Plot plot) { public boolean unclaimPlot(final PlotWorld plotworld, final Plot plot) {
final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK; final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK;
final PlotBlock claim = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK; final PlotBlock claim = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK;
if (claim != unclaim) { if (!claim.equals(unclaim)) {
setWall(plotworld, plot.id, new PlotBlock[] { unclaim }); setWall(plotworld, plot.id, new PlotBlock[] { unclaim });
} }
return true; return true;

102
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java
View File

@ -129,10 +129,103 @@ public class SetBlockFast_1_8 extends BukkitSetBlockManager {
return; return;
} }
} }
int currentId = world.getBlockAt(x, y, z).getTypeId(); Block block = world.getBlockAt(x, y, z);
int currentId = block.getTypeId();
if (currentId == id) { if (currentId == id) {
switch(id) {
case 0:
case 2:
case 4:
case 13:
case 14:
case 15:
case 20:
case 21:
case 22:
case 24:
case 25:
case 30:
case 32:
case 37:
case 39:
case 40:
case 41:
case 42:
case 45:
case 46:
case 47:
case 48:
case 49:
case 50:
case 51:
case 52:
case 54:
case 55:
case 56:
case 57:
case 58:
case 60:
case 61:
case 62:
case 7:
case 8:
case 9:
case 10:
case 11:
case 73:
case 74:
case 75:
case 76:
case 78:
case 79:
case 80:
case 81:
case 82:
case 83:
case 84:
case 85:
case 87:
case 88:
case 101:
case 102:
case 103:
case 110:
case 112:
case 113:
case 117:
case 121:
case 122:
case 123:
case 124:
case 129:
case 133:
case 138:
case 137:
case 140:
case 165:
case 166:
case 169:
case 170:
case 172:
case 173:
case 174:
case 176:
case 177:
case 181:
case 182:
case 188:
case 189:
case 190:
case 191:
case 192: {
return; return;
} }
}
if (block.getData() == data) {
return;
}
block.setData(data);
}
switch(currentId) { switch(currentId) {
case 54: case 54:
case 130: case 130:
@ -164,18 +257,11 @@ public class SetBlockFast_1_8 extends BukkitSetBlockManager {
case 33: case 33:
case 151: case 151:
case 178: { case 178: {
final Block block = world.getBlockAt(x, y, z);
if (block.getData() == data) { if (block.getData() == data) {
if (block.getTypeId() != id) {
block.setTypeId(id, false); block.setTypeId(id, false);
}
} else {
if (block.getTypeId() == id) {
block.setData(data, false);
} else { } else {
block.setTypeIdAndData(id, data, false); block.setTypeIdAndData(id, data, false);
} }
}
return; return;
} }
} }