EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Another WIP

Browse Source
This commit is contained in:
nossr50
2011-09-05 19:58:02 -07:00
parent e1fe38f45b
commit 40639ed5a9
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Changelog.txt
View File

@@ -2,6 +2,7 @@ Changelog:
#Versions without changelogs probably had very small misc fixes, like tweaks to the source code #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
Version 1.1.14 Version 1.1.14
mcMMO now transfers files between MC Server -> Client rather than Webserver -> Client (By default, you can change this..) mcMMO now transfers files between MC Server -> Client rather than Webserver -> Client (By default, you can change this..)
Fixed a few problems with readying abilities for Woodcutting/Axes
Changed the listener priority for OnEntityDamage from High to Monitor (Should make mcMMO compatible with Worldguards pvp regions among other things) Changed the listener priority for OnEntityDamage from High to Monitor (Should make mcMMO compatible with Worldguards pvp regions among other things)
Added addXpOverride for modders, this will ignore skill modifiers Added addXpOverride for modders, this will ignore skill modifiers
Added an option for Excavation to require use of a shovel, on by default Added an option for Excavation to require use of a shovel, on by default

2
src/com/gmail/nossr50/skills/Skills.java
View File

@@ -260,7 +260,7 @@ public class Skills
PP.setFistsPreparationATS(System.currentTimeMillis()); PP.setFistsPreparationATS(System.currentTimeMillis());
PP.setFistsPreparationMode(true); PP.setFistsPreparationMode(true);
} }
if((mcPermissions.getInstance().axes(player) || mcPermissions.getInstance().woodcutting(player)) && !PP.getAxePreparationMode()) if((mcPermissions.getInstance().axesAbility(player) || mcPermissions.getInstance().woodCuttingAbility(player)) && !PP.getAxePreparationMode())
{ {
if(m.isAxes(player.getItemInHand())) if(m.isAxes(player.getItemInHand()))
{ {

9
src/com/gmail/nossr50/spout/SpoutStuff.java
View File

@@ -1,5 +1,6 @@
package com.gmail.nossr50.spout; package com.gmail.nossr50.spout;
import java.io.BufferedOutputStream;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@@ -60,9 +61,9 @@ public class SpoutStuff
JarFile jar = new JarFile(plugin.mcmmo); JarFile jar = new JarFile(plugin.mcmmo);
JarEntry entry = jar.getJarEntry("resources/"+theFileName); JarEntry entry = jar.getJarEntry("resources/"+theFileName);
InputStream is = jar.getInputStream(entry); InputStream is = jar.getInputStream(entry);
FileOutputStream os = new FileOutputStream(currentFile);
byte[] buf = new byte[(int)entry.getSize()]; byte[] buf = new byte[(int)entry.getSize()];
is.read(buf, 0, (int)entry.getSize()); is.read(buf, 0, buf.length);
FileOutputStream os = new FileOutputStream(currentFile);
os.write(buf); os.write(buf);
os.close(); os.close();
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
@@ -185,9 +186,9 @@ public class SpoutStuff
files.add(new File(dir+"HUD/Standard/Icon.png")); files.add(new File(dir+"HUD/Standard/Icon.png"));
files.add(new File(dir+"HUD/Retro/Icon_r.png")); files.add(new File(dir+"HUD/Retro/Icon_r.png"));
//Repair SFX //Repair SFX
files.add(new File(dir+"/Sound/repair.wav")); files.add(new File(dir+"Sound/repair.wav"));
//Level SFX //Level SFX
files.add(new File(dir+"/Sound/level.wav")); files.add(new File(dir+"Sound/level.wav"));
return files; return files;
} }