Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compilable with Spigot 1.9. #479

Closed
wants to merge 1 commit into from
Closed

Compilable with Spigot 1.9. #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions complete_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ cd $DIR
echo "Removing old builds"
rm -rf builds/*

echo "Building 1.8.8-R0.1-SNAPSHOT"
mvn clean install $@ -DmcPackage=v1_8_R3 -DspigotVersion=1.8.8-R0.1-SNAPSHOT
echo "Building 1.9-R0.1-SNAPSHOT"
mvn clean install $@ -DmcPackage=v1_9_R1 -DspigotVersion=1.9-R0.1-SNAPSHOT

rc=$?
if [[ $rc != 0 ]] ; then
Expand Down
6 changes: 4 additions & 2 deletions jsonapi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,16 @@ versions = {}
# versions['1.7.9'] = package: 'v1_7_R3', cb_version: '1.7.9-R0.2'
# versions['1.7.10'] = package: 'v1_7_R4', cb_version: '1.7.10-R0.1-SNAPSHOT'
# versions['1.8.0'] = package: 'v1_8_R1', cb_version: '1.8-R0.1-SNAPSHOT'
versions['1.8.8'] = package: 'v1_8_R3', cb_version: '1.8.8-R0.1-SNAPSHOT'
#versions['1.8.8'] = package: 'v1_8_R3', cb_version: '1.8.8-R0.1-SNAPSHOT'
versions['1.9.0'] = package: 'v1_9_R1', cb_version: '1.9-R0.1-SNAPSHOT'

# versions['1.4'] = versions['1.4.7']
# versions['1.5'] = versions['1.5.2']
# versions['1.6'] = versions['1.6.4']
# versions['1.7'] = versions['1.7.10']
# versions['1.8'] = versions['1.8.0']
versions['1.8.8'] = versions['1.8.8']
# versions['1.8.8'] = versions['1.8.8']
versions['1.9'] = versions['1.9.0']

available_versions = Object.keys(versions)
build_cmd = (ver, cmd = "clean install") ->
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
<artifactItem>
<groupId>com.alecgorge.minecraft.jsonapi</groupId>
<artifactId>JSONAPI</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${basedir}/test/plugins</outputDirectory>
Expand Down Expand Up @@ -213,8 +213,8 @@
<artifactItem>
<groupId>com.alecgorge.minecraft.jsonapi</groupId>
<artifactId>JSONAPI</artifactId>
<version>${version}</version>
<destFileName>JSONAPI-${version}.jar</destFileName>
<version>${project.version}</version>
<destFileName>JSONAPI-${project.version}.jar</destFileName>
</artifactItem>
</artifactItems>
<outputDirectory>builds/Spigot-${spigotVersion}</outputDirectory>
Expand All @@ -232,8 +232,8 @@
<artifactItem>
<groupId>com.alecgorge.minecraft.jsonapi</groupId>
<artifactId>JSONAPI</artifactId>
<version>${version}</version>
<destFileName>JSONAPI-${version}.jar</destFileName>
<version>${project.version}</version>
<destFileName>JSONAPI-${project.version}.jar</destFileName>
</artifactItem>
</artifactItems>
<outputDirectory>builds/Spigot-all</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/alecgorge/minecraft/jsonapi/chat/BukkitRealisticChat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public boolean chatWithPlayer(String message, Player player) {

// based on
// net/minecraft/server/v1_8_R3/PlayerConnection.java#chat(2)
AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet());
AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet(((CraftServer)Bukkit.getServer()).getServer()));
getServer().getPluginManager().callEvent(event);

final MinecraftServer minecraftServer;
Expand Down