SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to use mc-dev rename revision 1

Browse Source 
By: Nathan Adams <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot
2011-11-29 23:17:43 +00:00
parent 540f893f86
commit 0939b7a7f9
17 changed files with 69 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java
View File

@@ -36,7 +36,7 @@ public class CraftMapCanvas implements MapCanvas {
if (x < 0 || y < 0 || x >= 128 || y >= 128) return;
if (buffer[y * 128 + x] != color) {
buffer[y * 128 + x] = color;
mapView.worldMap.a(x, y, y);
mapView.worldMap.flagDirty(x, y, y);
}
}

10
paper-server/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
View File

@@ -1,7 +1,7 @@
package org.bukkit.craftbukkit.map;
import net.minecraft.server.WorldMap;
import net.minecraft.server.WorldMapOrienter;
import net.minecraft.server.WorldMapDecoration;
import org.bukkit.entity.Player;
import org.bukkit.map.MapCanvas;
@@ -25,7 +25,7 @@ public class CraftMapRenderer extends MapRenderer {
// Map
for (int x = 0; x < 128; ++x) {
for (int y = 0; y < 128; ++y) {
canvas.setPixel(x, y, worldMap.f[y * 128 + x]);
canvas.setPixel(x, y, worldMap.colors[y * 128 + x]);
}
}
@@ -34,9 +34,9 @@ public class CraftMapRenderer extends MapRenderer {
while (cursors.size() > 0) {
cursors.removeCursor(cursors.getCursor(0));
}
for (int i = 0; i < worldMap.i.size(); ++i) {
WorldMapOrienter orienter = (WorldMapOrienter) worldMap.i.get(i);
cursors.addCursor(orienter.b, orienter.c, (byte)(orienter.d & 15), (byte)(orienter.a));
for (int i = 0; i < worldMap.decorations.size(); ++i) {
WorldMapDecoration decoration = (WorldMapDecoration) worldMap.decorations.get(i);
cursors.addCursor(decoration.locX, decoration.locY, (byte)(decoration.rotation & 15), (byte)(decoration.type));
}
}

12
paper-server/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
View File

@@ -46,11 +46,11 @@ public final class CraftMapView implements MapView {
}
public Scale getScale() {
return Scale.valueOf(worldMap.e);
return Scale.valueOf(worldMap.scale);
}
public void setScale(Scale scale) {
worldMap.e = scale.getValue();
worldMap.scale = scale.getValue();
}
public World getWorld() {
@@ -68,19 +68,19 @@ public final class CraftMapView implements MapView {
}
public int getCenterX() {
return worldMap.b;
return worldMap.centerX;
}
public int getCenterZ() {
return worldMap.c;
return worldMap.centerZ;
}
public void setCenterX(int x) {
worldMap.b = x;
worldMap.centerX = x;
}
public void setCenterZ(int z) {
worldMap.c = z;
worldMap.centerZ = z;
}
public List<MapRenderer> getRenderers() {