Skip to content

Commit ee88cac

Browse files
committed
Make compatible with CraftBukkit 1.7.9
1 parent 4ef9eb3 commit ee88cac

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.pepsoft</groupId>
66
<artifactId>BukkitScript</artifactId>
7-
<version>0.1.4-1.7.2</version>
7+
<version>0.1.4-1.7.9</version>
88
<packaging>jar</packaging>
99

1010
<name>BukkitScript</name>
@@ -43,12 +43,12 @@
4343
<dependency>
4444
<groupId>org.bukkit</groupId>
4545
<artifactId>bukkit</artifactId>
46-
<version>1.7.2-R0.1-SNAPSHOT</version>
46+
<version>1.7.9-R0.1-SNAPSHOT</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.bukkit</groupId>
5050
<artifactId>craftbukkit</artifactId>
51-
<version>1.7.2-R0.1-SNAPSHOT</version>
51+
<version>1.7.9-R0.1-SNAPSHOT</version>
5252
</dependency>
5353
</dependencies>
5454
</project>

src/main/java/org/pepsoft/bukkit/bukkitscript/context/BlockHelper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
*/
55
package org.pepsoft.bukkit.bukkitscript.context;
66

7-
import net.minecraft.server.v1_7_R1.EntityHuman;
7+
import net.minecraft.server.v1_7_R3.EntityHuman;
88
import org.bukkit.Material;
99
import org.bukkit.OfflinePlayer;
1010
import org.bukkit.World;
11-
import org.bukkit.craftbukkit.v1_7_R1.CraftWorld;
12-
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
11+
import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
12+
import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
1313

1414
/**
1515
*
@@ -98,6 +98,6 @@ private static void interact(org.bukkit.block.Block realBlock, OfflinePlayer rea
9898
org.bukkit.entity.Player onlinePlayer = (realPlayer != null) ? realPlayer.getPlayer() : null;
9999
EntityHuman entityHuman = (onlinePlayer != null) ? ((CraftPlayer) onlinePlayer).getHandle() : null;
100100
// TODO no idea what the last four parameters are for; they are new in MC 1.3.1:
101-
net.minecraft.server.v1_7_R1.Block.e(realBlock.getTypeId()).interact(((CraftWorld) realBlock.getWorld()).getHandle(), realBlock.getX(), realBlock.getY(), realBlock.getZ(), entityHuman, 0, 0f, 0f, 0f);
101+
net.minecraft.server.v1_7_R3.Block.e(realBlock.getTypeId()).interact(((CraftWorld) realBlock.getWorld()).getHandle(), realBlock.getX(), realBlock.getY(), realBlock.getZ(), entityHuman, 0, 0f, 0f, 0f);
102102
}
103103
}

src/main/java/org/pepsoft/bukkit/bukkitscript/context/Box.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
package org.pepsoft.bukkit.bukkitscript.context;
66

77
import java.util.logging.Level;
8-
import net.minecraft.server.v1_7_R1.Chunk;
8+
import net.minecraft.server.v1_7_R3.Chunk;
99
import org.bukkit.Material;
1010
import org.bukkit.OfflinePlayer;
1111
import org.bukkit.World;
12-
import org.bukkit.craftbukkit.v1_7_R1.CraftChunk;
13-
import org.bukkit.craftbukkit.v1_7_R1.CraftWorld;
12+
import org.bukkit.craftbukkit.v1_7_R3.CraftChunk;
13+
import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
1414
import org.bukkit.entity.Entity;
1515
import org.bukkit.event.EventHandler;
1616
import org.bukkit.event.EventPriority;
@@ -182,14 +182,14 @@ void set(int typeId, byte data) {
182182
int chunkZ2 = corner2.z >> 4;
183183
for (int chunkX = chunkX1; chunkX <= chunkX2; chunkX++) {
184184
for (int chunkZ = chunkZ1; chunkZ <= chunkZ2; chunkZ++) {
185-
net.minecraft.server.v1_7_R1.World mcWorld = ((CraftWorld) realWorld).getHandle();
185+
net.minecraft.server.v1_7_R3.World mcWorld = ((CraftWorld) realWorld).getHandle();
186186
for (int y = corner1.y; y <= corner2.y; y++) {
187187
for (int dx = 0; dx < 16; dx++) {
188188
for (int dz = 0; dz < 16; dz++) {
189189
int x = (chunkX << 4) | dx;
190190
int z = (chunkZ << 4) | dz;
191191
if ((x >= corner1.x) && (x <= corner2.x) && (z >= corner1.z) && (z <= corner2.z)) {
192-
mcWorld.setTypeAndData(x, y, z, net.minecraft.server.v1_7_R1.Block.e(typeId), data, FLAG_UPDATE | FLAG_MARK_CHUNK_DIRTY | FLAG_ONLY_IF_NOT_STATIC);
192+
mcWorld.setTypeAndData(x, y, z, net.minecraft.server.v1_7_R3.Block.e(typeId), data, FLAG_UPDATE | FLAG_MARK_CHUNK_DIRTY | FLAG_ONLY_IF_NOT_STATIC);
193193
}
194194
}
195195
}

src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: BukkitScript
2-
version: 0.1.4-1.7.2
2+
version: 0.1.4-1.7.9
33
main: org.pepsoft.bukkit.bukkitscript.BukkitScriptPlugin
44
commands:
55
setname:

0 commit comments

Comments
 (0)