Skip to content

Commit

Permalink
Update License, add Pastebin code.
Browse files Browse the repository at this point in the history
  • Loading branch information
fernferret committed Aug 5, 2011
1 parent 49bf884 commit db0b7f9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -2,4 +2,4 @@ Copyright (c) 2011, The Multiverse Team All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the FernFerret Studios nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the The Multiverse Team nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Expand Up @@ -240,13 +240,19 @@ public void setCore(MultiverseCore core) {
}

@Override
public void dumpVersionInfo() {
this.log(Level.INFO, "Multiverse-NetherPortals Version: " + this.getDescription().getVersion());
this.log(Level.INFO, "Bukkit Version: " + this.getServer().getVersion());
this.log(Level.INFO, "server.properties 'allow-nether': " + !MultiverseNetherPortals.netherDisabled);
this.log(Level.INFO, "World links: " + this.getWorldLinks());
this.log(Level.INFO, "Nether Prefix: " + netherPrefix);
this.log(Level.INFO, "Nether Suffix: " + netherSuffix);
this.log(Level.INFO, "Special Code: FRN001");
public String dumpVersionInfo(String buffer) {
buffer += logAndAddToPasteBinBuffer("Multiverse-NetherPortals Version: " + this.getDescription().getVersion());
buffer += logAndAddToPasteBinBuffer("Bukkit Version: " + this.getServer().getVersion());
buffer += logAndAddToPasteBinBuffer("server.properties 'allow-nether': " + !MultiverseNetherPortals.netherDisabled);
buffer += logAndAddToPasteBinBuffer("World links: " + this.getWorldLinks());
buffer += logAndAddToPasteBinBuffer("Nether Prefix: " + netherPrefix);
buffer += logAndAddToPasteBinBuffer("Nether Suffix: " + netherSuffix);
buffer += logAndAddToPasteBinBuffer("Special Code: FRN001");
return buffer;
}

private String logAndAddToPasteBinBuffer(String string) {
this.log(Level.INFO, string);
return "[Multiverse-NetherPortals] " + string + "\n";
}
}
Expand Up @@ -18,7 +18,7 @@ public void onCustomEvent(Event event) {
plugin.loadConfig();
((MVConfigReloadEvent)event).addConfig("Multiverse-NetherPortals - config.yml");
} else if(event instanceof MVVersionRequestEvent) {
plugin.dumpVersionInfo();
((MVVersionRequestEvent)event).setPasteBinBuffer(this.plugin.dumpVersionInfo(((MVVersionRequestEvent)event).getPasteBinBuffer()));
}
}
}
Expand Up @@ -39,7 +39,6 @@ private void getNewTeleportLocation(PlayerPortalEvent event, Location fromLocati
MVWorld tpto = this.plugin.getCore().getMVWorld(worldstring);
if (tpto != null && this.plugin.getCore().getPermissions().canEnterWorld(event.getPlayer(), tpto) && this.plugin.getCore().isMVWorld(fromLocation.getWorld().getName())) {
// Set the output location to the same XYZ coords but different world
// TODO: Add scaling
double toScaling = this.plugin.getCore().getMVWorld(tpto.getName()).getScaling();
double fromScaling = this.plugin.getCore().getMVWorld(event.getFrom().getWorld().getName()).getScaling();

Expand Down

0 comments on commit db0b7f9

Please sign in to comment.